Skip to content

Commit

Permalink
MAGETWO-50657: Static files are not loaded if Install Magento with no…
Browse files Browse the repository at this point in the history
…n-Eng locale and deploy static

Fixing class and method descriptions
  • Loading branch information
Igor Melnikov committed Mar 23, 2016
1 parent 3022eb0 commit 02b4c31
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use Magento\Framework\Validator\Locale;

/**
* Command for deploy static content
* Deploy static content command
*/
class DeployStaticContentCommand extends Command
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Deploy/Console/Command/SetModeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use Magento\Framework\App\State;

/**
* Command for change the Magento mode
* Command to set application mode
*/
class SetModeCommand extends Command
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Magento\Framework\App\State;

/**
* Command for change the Magento mode
* Command to show application mode
*/
class ShowModeCommand extends Command
{
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Deploy/Model/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
use Magento\User\Model\ResourceModel\User\Collection as UserCollection;

/**
* Generate static files, compile; clear var/generation, var/di/, var/view_preprocessed and pub/static directories
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Filesystem
Expand Down Expand Up @@ -126,7 +128,7 @@ public function __construct(
public function regenerateStatic(
OutputInterface $output
) {
// Сlean up /var/generation, /var/di/, /var/view_preprocessed and /pub/static directories
// Сlear var/generation, var/di/, var/view_preprocessed and pub/static directories
$this->cleanupFilesystem(
[
DirectoryList::CACHE,
Expand Down Expand Up @@ -156,7 +158,7 @@ protected function deployStaticContent(
. implode(' ', $this->getUsedLocales());

/**
* @todo build a solution that does not depend on exec
* @todo eliminate exec
*/
try {
$execOutput = $this->shell->execute($cmd);
Expand Down Expand Up @@ -213,7 +215,7 @@ private function getUserCollection()
}

/**
* Runs code multi-tenant compiler to generate code and DI information
* Runs compiler
*
* @param OutputInterface $output
* @return void
Expand All @@ -235,7 +237,7 @@ protected function compile(OutputInterface $output)
* exec command is necessary for now to isolate the autoloaders in the compiler from the memory state
* of this process, which would prevent some classes from being generated
*
* @todo build a solution that does not depend on exec
* @todo eliminate exec
*/
try {
$execOutput = $this->shell->execute($cmd);
Expand Down Expand Up @@ -288,7 +290,6 @@ public function cleanupFilesystem($directoryCodeList)
* @param int $dirPermissions
* @param int $filePermissions
* @return void
*
* @deprecated
*/
protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
Expand All @@ -308,7 +309,6 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
* Chenge permissions on static resources
*
* @return void
*
* @deprecated
*/
public function lockStaticResources()
Expand Down

0 comments on commit 02b4c31

Please sign in to comment.