diff --git a/.gitignore b/.gitignore index b7f681b292e4d..9c3cc2f5e67f9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,8 @@ atlassian* /.grunt /Gruntfile.js /package.json +/.php_cs +/.php_cs.cache /pub/media/*.* !/pub/media/.htaccess diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 4bd705bb09a2f..0000000000000 --- a/.php_cs +++ /dev/null @@ -1,52 +0,0 @@ -name('*.phtml') - ->exclude('dev/tests/functional/generated') - ->exclude('dev/tests/functional/var') - ->exclude('dev/tests/functional/vendor') - ->exclude('dev/tests/integration/tmp') - ->exclude('dev/tests/integration/var') - ->exclude('lib/internal/Cm') - ->exclude('lib/internal/Credis') - ->exclude('lib/internal/Less') - ->exclude('lib/internal/LinLibertineFont') - ->exclude('pub/media') - ->exclude('pub/static') - ->exclude('setup/vendor') - ->exclude('var'); - -return Symfony\CS\Config\Config::create() - ->finder($finder) - ->level(Symfony\CS\FixerInterface::PSR2_LEVEL) - ->fixers([ - 'double_arrow_multiline_whitespaces', - 'duplicate_semicolon', - 'extra_empty_lines', - 'include', - 'join_function', - 'namespace_no_leading_whitespace', - 'new_with_braces', - 'object_operator', - 'operators_spaces', - 'remove_leading_slash_use', - 'remove_lines_between_uses', - 'single_array_no_trailing_comma', - 'spaces_before_semicolon', - 'standardize_not_equal', - 'ternary_spaces', - 'unused_use', - 'whitespacy_lines', - 'concat_with_spaces', - 'multiline_spaces_before_semicolon', - 'ordered_use', - 'short_array_syntax', - ]); diff --git a/.php_cs.dist b/.php_cs.dist new file mode 100644 index 0000000000000..b4c0b9dfa812c --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1,50 @@ +name('*.phtml') + ->exclude('dev/tests/functional/generated') + ->exclude('dev/tests/functional/var') + ->exclude('dev/tests/functional/vendor') + ->exclude('dev/tests/integration/tmp') + ->exclude('dev/tests/integration/var') + ->exclude('lib/internal/Cm') + ->exclude('lib/internal/Credis') + ->exclude('lib/internal/Less') + ->exclude('lib/internal/LinLibertineFont') + ->exclude('pub/media') + ->exclude('pub/static') + ->exclude('setup/vendor') + ->exclude('var'); + +return PhpCsFixer\Config::create() + ->setFinder($finder) + ->setRules([ + '@PSR2' => true, + 'array_syntax' => ['syntax' => 'short'], + 'concat_space' => ['spacing' => 'one'], + 'include' => true, + 'new_with_braces' => true, + 'no_empty_statement' => true, + 'no_extra_consecutive_blank_lines' => ['use'], + 'no_extra_consecutive_blank_lines' => true, + 'no_leading_import_slash' => true, + 'no_leading_namespace_whitespace' => true, + 'no_multiline_whitespace_around_double_arrow' => true, + 'no_multiline_whitespace_before_semicolons' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'no_trailing_comma_in_singleline_array' => true, + 'no_unused_imports' => true, + 'no_whitespace_in_blank_line' => true, + 'object_operator_without_whitespace' => true, + 'ordered_imports' => true, + 'standardize_not_equals' => true, + 'ternary_operator_spaces' => true, + ]); diff --git a/app/code/Magento/AdminNotification/Model/Inbox.php b/app/code/Magento/AdminNotification/Model/Inbox.php index 08bfd0496c9a1..685b68b65766e 100644 --- a/app/code/Magento/AdminNotification/Model/Inbox.php +++ b/app/code/Magento/AdminNotification/Model/Inbox.php @@ -7,7 +7,6 @@ use Magento\Framework\Notification\MessageInterface; use Magento\Framework\Notification\NotifierInterface; -use Magento\AdminNotification\Model\InboxInterface; /** * AdminNotification Inbox model diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php index 312394787ef82..fce3f6b105dc5 100644 --- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php +++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php @@ -9,7 +9,7 @@ use Magento\Store\Model\Store; /** - * @deprecated + * @deprecated */ class Baseurl implements \Magento\Framework\Notification\MessageInterface { diff --git a/app/code/Magento/AdminNotification/Setup/InstallSchema.php b/app/code/Magento/AdminNotification/Setup/InstallSchema.php index 01c447b9cc2db..d3f9dd2e0c7be 100644 --- a/app/code/Magento/AdminNotification/Setup/InstallSchema.php +++ b/app/code/Magento/AdminNotification/Setup/InstallSchema.php @@ -120,6 +120,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con $installer->getConnection()->createTable($table); $installer->endSetup(); - } } diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php index d1f78ccf89a6f..4dd02cd8936d3 100644 --- a/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php +++ b/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php @@ -6,8 +6,8 @@ namespace Magento\AdminNotification\Test\Unit\Model; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\Config\ConfigOptionsListConstants; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php index d35a409b58b98..00d7719c8fff6 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -5,10 +5,10 @@ */ namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export; -use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; -use Magento\Framework\Controller\ResultFactory; use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing; use Magento\Catalog\Model\Product as CatalogProduct; +use Magento\Framework\Controller\ResultFactory; +use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; class GetFilter extends ExportController { diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php index 4219fca720912..78357f5293a8e 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php @@ -5,10 +5,10 @@ */ namespace Magento\AdvancedPricingImportExport\Model\Export; -use Magento\Store\Model\Store; -use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing; use Magento\Catalog\Model\Product as CatalogProduct; +use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; +use Magento\Store\Model\Store; /** * Export Advanced Pricing diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php index 0bb44c238c720..772f8eacdd587 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php @@ -8,7 +8,6 @@ use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface; use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface; -use Magento\Framework\App\ResourceConnection; /** * Class AdvancedPricing @@ -68,8 +67,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract ValidatorInterface::ERROR_INVALID_TIER_PRICE_TYPE => 'Value for \'tier_price_value_type\' ' . 'attribute contains incorrect value, acceptable values are Fixed, Discount', ValidatorInterface::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete', - ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL => - 'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format', + ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL => 'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format', ]; /** diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php index ffc191ac655f7..593ca2a7dc634 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; -use \Magento\Framework\Validator\AbstractValidator; +use Magento\Framework\Validator\AbstractValidator; class Validator extends AbstractValidator implements RowValidatorInterface { diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php index bc57b8482963a..32cf76506b1bb 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php +++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php @@ -6,8 +6,8 @@ namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator; use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing; -use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface; +use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator; class Website extends AbstractImportValidator implements RowValidatorInterface { @@ -85,6 +85,6 @@ public function isValid($value) */ public function getAllWebsitesValue() { - return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']'; + return AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $this->websiteModel->getBaseCurrency()->getCurrencyCode() . ']'; } } diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php index a531b10da4bbb..e079a8daa40c8 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php @@ -5,7 +5,7 @@ */ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Export; -use \Magento\Store\Model\Store; +use Magento\Store\Model\Store; /** * @SuppressWarnings(PHPMD) diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php index a75a88561acbf..7f710bec043de 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator; -use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; +use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; /** * @SuppressWarnings(PHPMD) diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php index b03d83abd7016..ab326a2ca34b5 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator; -use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; +use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; /** * Class TierPriceTypeTest. diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php index 6a0fd28ac7466..5e4deedc410ed 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator; -use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; +use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; class WebsiteTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php index f95415f43b5b6..a6f6f92017242 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php @@ -5,8 +5,8 @@ */ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing; -use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator as Validator; -use \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface; +use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator as Validator; +use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface; class ValidatorTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php index e873b50321200..9049ec31d6a6b 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php @@ -6,9 +6,9 @@ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import; -use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; -use \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory; -use \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface; +use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing; +use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface; +use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory; /** * @SuppressWarnings(PHPMD) diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php index 67f6d33a9df15..731b2d3c52d35 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php +++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Indexer\Product\Price\Plugin; -use \Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import as Import; +use Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import as Import; class ImportTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php index 23a1b19061e03..81f69fec690a8 100644 --- a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php +++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php @@ -7,7 +7,6 @@ use Magento\Analytics\Model\SubscriptionStatusProvider; use Magento\Backend\Block\Template\Context; -use Magento\Framework\Data\Form\Element\AbstractElement; /** * Class SubscriptionStatusLabel. diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/BasicTier/SignUp.php b/app/code/Magento/Analytics/Controller/Adminhtml/BasicTier/SignUp.php index 73c39d7c14a59..e0895a6732305 100644 --- a/app/code/Magento/Analytics/Controller/Adminhtml/BasicTier/SignUp.php +++ b/app/code/Magento/Analytics/Controller/Adminhtml/BasicTier/SignUp.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Controller\Adminhtml\BasicTier; use Magento\Backend\App\Action; -use Magento\Config\Model\Config; use Magento\Backend\App\Action\Context; +use Magento\Config\Model\Config; /** * Class SignUp diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php index b87730132e3d4..88575624e4078 100644 --- a/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php +++ b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php @@ -9,10 +9,10 @@ use Magento\Analytics\Model\NotificationTime; use Magento\Backend\App\Action; use Magento\Backend\App\Action\Context; -use Magento\Framework\Intl\DateTimeFactory; use Magento\Framework\Controller\Result\Json; use Magento\Framework\Controller\ResultFactory; use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Intl\DateTimeFactory; use Psr\Log\LoggerInterface; /** @@ -55,7 +55,6 @@ public function __construct( $this->notificationTime = $notificationTime; $this->logger = $logger; parent::__construct($context); - } /** diff --git a/app/code/Magento/Analytics/Cron/SignUp.php b/app/code/Magento/Analytics/Cron/SignUp.php index b8d79ae2707b3..e51b74e1cfbc4 100644 --- a/app/code/Magento/Analytics/Cron/SignUp.php +++ b/app/code/Magento/Analytics/Cron/SignUp.php @@ -5,13 +5,13 @@ */ namespace Magento\Analytics\Cron; -use Magento\Analytics\Model\Connector; -use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler; -use Magento\Framework\App\Config\ReinitableConfigInterface; -use Magento\Framework\App\Config\Storage\WriterInterface; use Magento\AdminNotification\Model\InboxFactory; use Magento\AdminNotification\Model\ResourceModel\Inbox as InboxResource; +use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler; +use Magento\Analytics\Model\Connector; use Magento\Analytics\Model\FlagManager; +use Magento\Framework\App\Config\ReinitableConfigInterface; +use Magento\Framework\App\Config\Storage\WriterInterface; /** * Class SignUp diff --git a/app/code/Magento/Analytics/Cron/Update.php b/app/code/Magento/Analytics/Cron/Update.php index 4ed1346ade9a5..ea89660d4a0a1 100644 --- a/app/code/Magento/Analytics/Cron/Update.php +++ b/app/code/Magento/Analytics/Cron/Update.php @@ -7,10 +7,9 @@ use Magento\Analytics\Model\Connector; use Magento\Analytics\Model\FlagManager; +use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; use Magento\Framework\App\Config\ReinitableConfigInterface; use Magento\Framework\App\Config\Storage\WriterInterface; -use Magento\AdminNotification\Model\ResourceModel\Inbox as InboxResource; -use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; /** * Class Update diff --git a/app/code/Magento/Analytics/Model/Condition/CanViewNotification.php b/app/code/Magento/Analytics/Model/Condition/CanViewNotification.php index a7dc93bcab800..2be2e5acef4fa 100644 --- a/app/code/Magento/Analytics/Model/Condition/CanViewNotification.php +++ b/app/code/Magento/Analytics/Model/Condition/CanViewNotification.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Model\Condition; -use Magento\Backend\Model\View\Layout\ConditionInterface; use Magento\Analytics\Model\NotificationTime; +use Magento\Backend\Model\View\Layout\ConditionInterface; use Magento\Framework\Intl\DateTimeFactory; /** diff --git a/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php b/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php index 208f3a5dad7c8..3b3e8f9268037 100644 --- a/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php +++ b/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php @@ -85,7 +85,7 @@ public function afterSave() $this->_logger->error($e->getMessage()); throw new LocalizedException(__('Cron settings can\'t be saved')); } - + return parent::afterSave(); } } diff --git a/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php b/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php index 0f169a780dcb6..3d7443a535cfb 100644 --- a/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php +++ b/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php @@ -5,9 +5,9 @@ */ namespace Magento\Analytics\Model\Config\Backend\Enabled; +use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\Config\Backend\CollectionTime; use Magento\Analytics\Model\FlagManager; -use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\NotificationTime; use Magento\Framework\App\Config\Storage\WriterInterface; use Magento\Framework\App\Config\Value; diff --git a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php index 388132ea73144..ae1767322e4dd 100644 --- a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php +++ b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php @@ -5,9 +5,9 @@ */ namespace Magento\Analytics\Model\Connector\Http\Client; -use Psr\Log\LoggerInterface; -use Magento\Framework\HTTP\Adapter\CurlFactory; use Magento\Analytics\Model\Connector\Http\ResponseFactory; +use Magento\Framework\HTTP\Adapter\CurlFactory; +use Psr\Log\LoggerInterface; /** * A CURL HTTP client. diff --git a/app/code/Magento/Analytics/Model/Connector/SignUpRequest.php b/app/code/Magento/Analytics/Model/Connector/SignUpRequest.php index 74bfa84d0ef62..5f4574a2fa6bc 100644 --- a/app/code/Magento/Analytics/Model/Connector/SignUpRequest.php +++ b/app/code/Magento/Analytics/Model/Connector/SignUpRequest.php @@ -7,9 +7,9 @@ use Magento\Config\Model\Config; use Magento\Framework\HTTP\ZendClient; -use Zend_Http_Response as HttpResponse; use Magento\Store\Model\Store; use Psr\Log\LoggerInterface; +use Zend_Http_Response as HttpResponse; /** * Representation of a 'SignUp' request. diff --git a/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php b/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php index ba9e779122f55..18009824f1938 100644 --- a/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php +++ b/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php @@ -7,11 +7,11 @@ use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\FlagManager; -use Magento\Framework\HTTP\ZendClient; +use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; use Magento\Config\Model\Config; -use Psr\Log\LoggerInterface; +use Magento\Framework\HTTP\ZendClient; use Magento\Store\Model\Store; -use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; +use Psr\Log\LoggerInterface; /** * Class UpdateCommand diff --git a/app/code/Magento/Analytics/Model/ExportDataHandler.php b/app/code/Magento/Analytics/Model/ExportDataHandler.php index 3f451e8a07872..24e1a0e8005c5 100644 --- a/app/code/Magento/Analytics/Model/ExportDataHandler.php +++ b/app/code/Magento/Analytics/Model/ExportDataHandler.php @@ -6,10 +6,10 @@ namespace Magento\Analytics\Model; +use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\Archive; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Filesystem; -use Magento\Framework\Archive; -use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\Filesystem\Directory\WriteInterface; /** diff --git a/app/code/Magento/Analytics/Model/FileRecorder.php b/app/code/Magento/Analytics/Model/FileRecorder.php index c1ef8da247147..c087fb1d208b3 100644 --- a/app/code/Magento/Analytics/Model/FileRecorder.php +++ b/app/code/Magento/Analytics/Model/FileRecorder.php @@ -78,7 +78,6 @@ public function recordNewFile(EncodedContext $encodedContext) $this->removeOldFile($fileInfo, $directory); return true; - } /** diff --git a/app/code/Magento/Analytics/Model/FlagManager.php b/app/code/Magento/Analytics/Model/FlagManager.php index 47c8f0a0da2dd..b3890dafef6c2 100644 --- a/app/code/Magento/Analytics/Model/FlagManager.php +++ b/app/code/Magento/Analytics/Model/FlagManager.php @@ -5,9 +5,9 @@ */ namespace Magento\Analytics\Model; -use Magento\Framework\FlagFactory; -use Magento\Framework\Flag\FlagResource; use Magento\Framework\Flag; +use Magento\Framework\Flag\FlagResource; +use Magento\Framework\FlagFactory; /** * Service that allows to handle a flag object as a scalar value. diff --git a/app/code/Magento/Analytics/Model/IntegrationManager.php b/app/code/Magento/Analytics/Model/IntegrationManager.php index bf625f03dc69a..55ea285164380 100644 --- a/app/code/Magento/Analytics/Model/IntegrationManager.php +++ b/app/code/Magento/Analytics/Model/IntegrationManager.php @@ -6,11 +6,11 @@ namespace Magento\Analytics\Model; +use Magento\Config\Model\Config as SystemConfig; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Integration\Api\IntegrationServiceInterface; -use Magento\Config\Model\Config as SystemConfig; -use Magento\Integration\Model\Integration; use Magento\Integration\Api\OauthServiceInterface; +use Magento\Integration\Model\Integration; /** * Class IntegrationManager diff --git a/app/code/Magento/Analytics/Model/ReportWriter.php b/app/code/Magento/Analytics/Model/ReportWriter.php index 80b1210f9677a..39c5fec752585 100644 --- a/app/code/Magento/Analytics/Model/ReportWriter.php +++ b/app/code/Magento/Analytics/Model/ReportWriter.php @@ -80,7 +80,6 @@ public function write(WriteInterface $directory, $path) if (!$headers) { $headers = array_keys($row); $stream->writeCsv($headers); - } $stream->writeCsv($row); } diff --git a/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php b/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php index 314225dc3d346..da15f8e13e2ae 100644 --- a/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php +++ b/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php @@ -9,8 +9,8 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Store\Api\Data\StoreInterface; use Magento\Store\Api\Data\WebsiteInterface; -use Magento\Store\Model\StoreManagerInterface; use Magento\Store\Model\ScopeInterface; +use Magento\Store\Model\StoreManagerInterface; /** * Class StoreConfigurationProvider diff --git a/app/code/Magento/Analytics/ReportXml/Config/Mapper.php b/app/code/Magento/Analytics/ReportXml/Config/Mapper.php index cd64867984530..190e84c434182 100644 --- a/app/code/Magento/Analytics/ReportXml/Config/Mapper.php +++ b/app/code/Magento/Analytics/ReportXml/Config/Mapper.php @@ -31,7 +31,6 @@ public function execute($configData) $entityData = array_shift($queryData['source']); $queries[$queryData['name']] = $queryData; $queries[$queryData['name']]['source'] = $entityData; - } return $queries; } diff --git a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php index b52cacb589ce8..b390055478c53 100644 --- a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php +++ b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php @@ -7,8 +7,8 @@ namespace Magento\Analytics\ReportXml; use Magento\Framework\App\ResourceConnection; -use Magento\Framework\ObjectManagerInterface; use Magento\Framework\DB\Adapter\AdapterInterface; +use Magento\Framework\ObjectManagerInterface; /** * Class ConnectionFactory diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php index 80f52d23f1a01..9e017259b7ca6 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php +++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php @@ -6,9 +6,9 @@ namespace Magento\Analytics\ReportXml\DB\Assembler; +use Magento\Analytics\ReportXml\DB\ConditionResolver; use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\SelectBuilder; -use Magento\Analytics\ReportXml\DB\ConditionResolver; /** * Class FilterAssembler diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php index 2ae835bb3344f..af42601c6c19e 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php +++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php @@ -7,8 +7,8 @@ namespace Magento\Analytics\ReportXml\DB\Assembler; use Magento\Analytics\ReportXml\DB\ColumnsResolver; -use Magento\Analytics\ReportXml\DB\SelectBuilder; use Magento\Analytics\ReportXml\DB\NameResolver; +use Magento\Analytics\ReportXml\DB\SelectBuilder; /** * Class FromAssembler @@ -52,8 +52,7 @@ public function assemble(SelectBuilder $selectBuilder, $queryConfig) { $selectBuilder->setFrom( [ - $this->nameResolver->getAlias($queryConfig['source']) - => $this->nameResolver->getName($queryConfig['source']) + $this->nameResolver->getAlias($queryConfig['source']) => $this->nameResolver->getName($queryConfig['source']) ] ); $columns = $this->columnsResolver->getColumns($selectBuilder, $queryConfig['source']); diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php index a457b8bd126a1..77b908f399014 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php +++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php @@ -6,10 +6,10 @@ namespace Magento\Analytics\ReportXml\DB\Assembler; +use Magento\Analytics\ReportXml\DB\ColumnsResolver; +use Magento\Analytics\ReportXml\DB\ConditionResolver; use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\SelectBuilder; -use Magento\Analytics\ReportXml\DB\ConditionResolver; -use Magento\Analytics\ReportXml\DB\ColumnsResolver; /** * Class JoinAssembler diff --git a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php index 57f08c236116a..59cfac595a6f3 100644 --- a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php +++ b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php @@ -61,7 +61,6 @@ public function getColumns(SelectBuilder $selectBuilder, $entityConfig) if (isset($attributeData['group'])) { $group[$columnAlias] = $expression; } - } $selectBuilder->setGroup(array_merge($selectBuilder->getGroup(), $group)); return $columns; diff --git a/app/code/Magento/Analytics/ReportXml/Query.php b/app/code/Magento/Analytics/ReportXml/Query.php index 2bdf2432600dd..5e62235f329e4 100644 --- a/app/code/Magento/Analytics/ReportXml/Query.php +++ b/app/code/Magento/Analytics/ReportXml/Query.php @@ -25,7 +25,7 @@ class Query implements \JsonSerializable private $selectHydrator; /** - * @var string + * @var string */ private $connectionName; diff --git a/app/code/Magento/Analytics/ReportXml/QueryFactory.php b/app/code/Magento/Analytics/ReportXml/QueryFactory.php index 001a35354cf0a..9d91bf066dbf3 100644 --- a/app/code/Magento/Analytics/ReportXml/QueryFactory.php +++ b/app/code/Magento/Analytics/ReportXml/QueryFactory.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\ReportXml; use Magento\Analytics\ReportXml\DB\SelectBuilderFactory; -use Magento\Framework\ObjectManagerInterface; use Magento\Framework\App\CacheInterface; +use Magento\Framework\ObjectManagerInterface; /** * Class QueryFactory diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php index 9a8a8ffab0861..7c92db6964865 100644 --- a/app/code/Magento/Analytics/ReportXml/ReportProvider.php +++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php @@ -74,6 +74,5 @@ public function getReport($name, SearchCriteria $criteria = null) $connection = $this->connectionFactory->getConnection($query->getConnectionName()); $statement = $connection->query($query->getSelect()); return $this->iteratorFactory->create($statement, $this->getIteratorName($query)); - } } diff --git a/app/code/Magento/Analytics/ReportXml/SelectHydrator.php b/app/code/Magento/Analytics/ReportXml/SelectHydrator.php index b9a46fd286bd7..2f7ff54ac89d7 100644 --- a/app/code/Magento/Analytics/ReportXml/SelectHydrator.php +++ b/app/code/Magento/Analytics/ReportXml/SelectHydrator.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\ReportXml; -use Magento\Framework\DB\Select; use Magento\Framework\App\ResourceConnection; +use Magento\Framework\DB\Select; /** * Class SelectHydrator diff --git a/app/code/Magento/Analytics/Setup/InstallData.php b/app/code/Magento/Analytics/Setup/InstallData.php index b8d311ee5ea15..29e0458512918 100644 --- a/app/code/Magento/Analytics/Setup/InstallData.php +++ b/app/code/Magento/Analytics/Setup/InstallData.php @@ -6,10 +6,10 @@ namespace Magento\Analytics\Setup; +use Magento\Analytics\Model\NotificationTime; use Magento\Framework\Setup\InstallDataInterface; use Magento\Framework\Setup\ModuleContextInterface; use Magento\Framework\Setup\ModuleDataSetupInterface; -use Magento\Analytics\Model\NotificationTime; /** * @codeCoverageIgnore diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BasicTier/SignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BasicTier/SignUpTest.php index c9311ddf1ccc8..224f9474d0732 100644 --- a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BasicTier/SignUpTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BasicTier/SignUpTest.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Test\Unit\Controller\Adminhtml\BasicTier; use Magento\Analytics\Controller\Adminhtml\BasicTier\SignUp; -use Magento\Config\Model\Config; use Magento\Backend\Model\View\Result\RedirectFactory; +use Magento\Config\Model\Config; use Magento\Framework\Controller\Result\Redirect; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php index faedcedd2b5e8..6c6691a6fa0a8 100644 --- a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php @@ -113,7 +113,6 @@ public function testExecute() */ public function testExecuteWithException(\Exception $exception) { - $this->resultFactoryMock ->expects($this->once()) ->method('create') diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/PostponeTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/PostponeTest.php index 78027298028d1..393f3f874432c 100644 --- a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/PostponeTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/PostponeTest.php @@ -7,14 +7,13 @@ namespace Magento\Analytics\Test\Unit\Controller\Adminhtml\Subscription; use Magento\Analytics\Controller\Adminhtml\Subscription\Postpone; -use Magento\Framework\App\Request\Http; +use Magento\Analytics\Model\NotificationTime; use Magento\Framework\Controller\Result\Json; use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\Intl\DateTimeFactory; -use Psr\Log\LoggerInterface; -use Magento\Analytics\Model\NotificationTime; use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Intl\DateTimeFactory; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Psr\Log\LoggerInterface; /** * Class PostponeTest diff --git a/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php index 1b5d0d6a92b1c..4403bdaf99a03 100644 --- a/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php @@ -5,15 +5,15 @@ */ namespace Magento\Analytics\Test\Unit\Cron; -use Magento\Analytics\Model\Connector; -use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler; -use Magento\Framework\App\Config\ReinitableConfigInterface; -use Magento\Framework\App\Config\Storage\WriterInterface; +use Magento\AdminNotification\Model\Inbox; use Magento\AdminNotification\Model\InboxFactory; use Magento\AdminNotification\Model\ResourceModel\Inbox as InboxResource; -use Magento\Analytics\Model\FlagManager; use Magento\Analytics\Cron\SignUp; -use Magento\AdminNotification\Model\Inbox; +use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler; +use Magento\Analytics\Model\Connector; +use Magento\Analytics\Model\FlagManager; +use Magento\Framework\App\Config\ReinitableConfigInterface; +use Magento\Framework\App\Config\Storage\WriterInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php b/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php index ba52571710212..259e7dbeb1927 100644 --- a/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php @@ -5,12 +5,12 @@ */ namespace Magento\Analytics\Test\Unit\Cron; +use Magento\Analytics\Cron\Update; use Magento\Analytics\Model\Connector; +use Magento\Analytics\Model\FlagManager; use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; use Magento\Framework\App\Config\ReinitableConfigInterface; use Magento\Framework\App\Config\Storage\WriterInterface; -use Magento\Analytics\Model\FlagManager; -use Magento\Analytics\Cron\Update; /** * Class Update diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php index f361fde03f02d..c135dbff5adb8 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php @@ -7,9 +7,9 @@ namespace Magento\Analytics\Test\Unit\Model\Condition; use Magento\Analytics\Model\Condition\CanViewNotification; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Analytics\Model\NotificationTime; use Magento\Framework\Intl\DateTimeFactory; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; /** * Class CanViewNotificationTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php index 132aa4aac9529..bcdd5f8ce47b3 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php @@ -76,7 +76,6 @@ public function testAfterSave() Value::class, $this->collectionTime->afterSave() ); - } /** diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php index 42d7ea0824ad5..1f148104ad0db 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php @@ -5,12 +5,12 @@ */ namespace Magento\Analytics\Test\Unit\Model\Connector; +use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\Connector\SignUpCommand; use Magento\Analytics\Model\Connector\SignUpRequest; -use Magento\Analytics\Model\AnalyticsToken; use Magento\Analytics\Model\IntegrationManager; -use Magento\Integration\Model\Oauth\Token as IntegrationToken; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Integration\Model\Oauth\Token as IntegrationToken; /** * Class SignUpCommandTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php index f16944d2f3417..ef842af49a108 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php @@ -6,13 +6,13 @@ namespace Magento\Analytics\Test\Unit\Model\Connector; use Magento\Analytics\Model\AnalyticsToken; +use Magento\Analytics\Model\Connector\Http\ClientInterface; +use Magento\Analytics\Model\Connector\UpdateCommand; use Magento\Analytics\Model\FlagManager; -use Magento\Framework\HTTP\ZendClient; +use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; use Magento\Config\Model\Config; +use Magento\Framework\HTTP\ZendClient; use Psr\Log\LoggerInterface; -use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin; -use Magento\Analytics\Model\Connector\UpdateCommand; -use Magento\Analytics\Model\Connector\Http\ClientInterface; /** * Class SignUpCommandTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php index a52186adf989e..d44fbc5300378 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Test\Unit\Model; use Magento\Analytics\Model\Connector; -use Magento\Framework\ObjectManagerInterface; use Magento\Analytics\Model\Connector\SignUpCommand; +use Magento\Framework\ObjectManagerInterface; /** * Class SignUpCommandTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php index 21fe5fdf8081c..45efeecc38be2 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php @@ -194,7 +194,7 @@ public function testPrepareExportData($isArchiveSourceDirectory) ->with( $archiveSource, $archiveAbsolutePath, - $isArchiveSourceDirectory ? true: false + $isArchiveSourceDirectory ? true : false ); $fileContent = 'Some text'; diff --git a/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php b/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php index 282ab67a523dc..e99df6d58db0a 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php @@ -44,8 +44,8 @@ public function testConstruct($path, $initializationVector) array_filter($constructorArguments) ); - $this->assertSame($path?:'', $fileInfo->getPath()); - $this->assertSame($initializationVector?:'', $fileInfo->getInitializationVector()); + $this->assertSame($path ?: '', $fileInfo->getPath()); + $this->assertSame($initializationVector ?: '', $fileInfo->getInitializationVector()); } /** diff --git a/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php index 244b46439a492..3521854013cff 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php @@ -136,7 +136,7 @@ public function testRecordNewFile($pathToExistingFile) $hashLength = 64; $fileRelativePathPattern = '#' . preg_quote($this->fileSubdirectoryPath, '#') - . '.{' . $hashLength . '}/' . preg_quote($this->encodedFileName, '#') .'#'; + . '.{' . $hashLength . '}/' . preg_quote($this->encodedFileName, '#') . '#'; $this->directoryMock ->expects($this->once()) ->method('writeFile') diff --git a/app/code/Magento/Analytics/Test/Unit/Model/FlagManagerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/FlagManagerTest.php index 77abb0c87e1ea..d4df1d70523ac 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/FlagManagerTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/FlagManagerTest.php @@ -6,9 +6,9 @@ namespace Magento\Analytics\Test\Unit\Model; use Magento\Analytics\Model\FlagManager; -use Magento\Framework\FlagFactory; -use Magento\Framework\Flag\FlagResource; use Magento\Framework\Flag; +use Magento\Framework\Flag\FlagResource; +use Magento\Framework\FlagFactory; /** * Class FlagManagerTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php index 14af7c7e66e99..351f2aab59e8d 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php @@ -6,12 +6,12 @@ namespace Magento\Analytics\Test\Unit\Model; -use Magento\Integration\Api\IntegrationServiceInterface; -use Magento\Config\Model\Config; -use Magento\Integration\Model\Integration; use Magento\Analytics\Model\IntegrationManager; -use Magento\Integration\Api\OauthServiceInterface; +use Magento\Config\Model\Config; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Integration\Api\IntegrationServiceInterface; +use Magento\Integration\Api\OauthServiceInterface; +use Magento\Integration\Model\Integration; /** * Class IntegrationManagerTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php index e0ae69c975f7e..92bf356596a51 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php @@ -6,14 +6,14 @@ namespace Magento\Analytics\Test\Unit\Model; use Magento\Analytics\Api\Data\LinkInterface; +use Magento\Analytics\Api\Data\LinkInterfaceFactory; use Magento\Analytics\Model\FileInfo; use Magento\Analytics\Model\FileInfoManager; use Magento\Analytics\Model\LinkProvider; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Analytics\Api\Data\LinkInterfaceFactory; +use Magento\Framework\UrlInterface; use Magento\Store\Model\Store; use Magento\Store\Model\StoreManagerInterface; -use Magento\Framework\UrlInterface; /** * Class LinkProviderTest diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php index bf6456610f7a3..c0c15f1b33e9e 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php @@ -117,7 +117,7 @@ public function testPluginForAfterSave( BaseUrlConfigPlugin::UPDATE_CRON_STRING_PATH, '0 * * * *' ); - + $this->assertEquals( $this->configValueMock, $this->plugin->afterAfterSave($this->configValueMock, $this->configValueMock) diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php index 4f3648a776b53..cdcc229b89c13 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php @@ -5,8 +5,8 @@ */ namespace Magento\Analytics\Test\Unit\Model; -use Magento\Analytics\Model\Connector\OTPRequest; use Magento\Analytics\Model\AnalyticsToken; +use Magento\Analytics\Model\Connector\OTPRequest; use Magento\Analytics\Model\ReportUrlProvider; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php index 7bd6a0c5d5534..4dbb1e9218102 100644 --- a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php +++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Test\Unit\Model\ReportXml; -use Magento\Framework\Module\Manager as ModuleManager; use Magento\Analytics\Model\ReportXml\ModuleIterator; +use Magento\Framework\Module\Manager as ModuleManager; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class ModuleIteratorTest extends \PHPUnit_Framework_TestCase diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/SchemaLocatorTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/SchemaLocatorTest.php index a4b14490a6fba..18e4d303f6165 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/SchemaLocatorTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/SchemaLocatorTest.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Test\Unit\ReportXml\Config; use Magento\Analytics\ReportXml\Config\SchemaLocator; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\Config\Dom\UrnResolver; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; /** * Class SchemaLocatorTest diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php index 9c88eb7616e30..0e8ee679b9372 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php @@ -7,9 +7,9 @@ use Magento\Analytics\ReportXml\ConnectionFactory; use Magento\Framework\App\ResourceConnection; +use Magento\Framework\DB\Adapter\AdapterInterface; use Magento\Framework\DB\Adapter\Pdo\Mysql as MysqlPdoAdapter; use Magento\Framework\ObjectManagerInterface; -use Magento\Framework\DB\Adapter\AdapterInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; /** diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php index ae79f7536c504..e5eab20d4fd72 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php @@ -5,8 +5,8 @@ */ namespace Magento\Analytics\Test\Unit\ReportXml\DB; -use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\ColumnsResolver; +use Magento\Analytics\ReportXml\DB\NameResolver; use Magento\Analytics\ReportXml\DB\SelectBuilder; /** @@ -94,8 +94,7 @@ public function testGetColumns($expression, $attributeData) public function dataProvider() { return [ - 'TestWithFunction' => - [ + 'TestWithFunction' => [ 'expression' => "SUM( DISTINCT fn.name)", 'attributeData' => ['adata1', 'function' => 'SUM', 'distinct' => true, 'group' => true], ], diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php index 1edf6a79ffa14..ab0146ad687d2 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php @@ -6,8 +6,8 @@ namespace Magento\Analytics\Test\Unit\ReportXml\DB; use Magento\Analytics\ReportXml\DB\ConditionResolver; -use Magento\Framework\App\ResourceConnection; use Magento\Analytics\ReportXml\DB\SelectBuilder; +use Magento\Framework\App\ResourceConnection; use Magento\Framework\DB\Adapter\AdapterInterface; /** diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php index 8820e102f1180..d1c1ff88e10df 100644 --- a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php +++ b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php @@ -7,6 +7,7 @@ // @codingStandardsIgnoreFile namespace Magento\Authorization\Model\ResourceModel; + use Magento\Framework\App\ObjectManager; /** diff --git a/app/code/Magento/Authorization/Setup/InstallData.php b/app/code/Magento/Authorization/Setup/InstallData.php index c837973fb7476..8410d9cb74935 100644 --- a/app/code/Magento/Authorization/Setup/InstallData.php +++ b/app/code/Magento/Authorization/Setup/InstallData.php @@ -6,11 +6,11 @@ namespace Magento\Authorization\Setup; +use Magento\Authorization\Model\Acl\Role\Group as RoleGroup; +use Magento\Authorization\Model\UserContextInterface; use Magento\Framework\Setup\InstallDataInterface; use Magento\Framework\Setup\ModuleContextInterface; use Magento\Framework\Setup\ModuleDataSetupInterface; -use Magento\Authorization\Model\Acl\Role\Group as RoleGroup; -use Magento\Authorization\Model\UserContextInterface; /** * @codeCoverageIgnore diff --git a/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php b/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php index 631bf1db6415f..2e76b6cac8235 100644 --- a/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php +++ b/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php @@ -6,7 +6,7 @@ namespace Magento\Authorization\Test\Unit\Model\Acl; -use \Magento\Authorization\Model\Acl\AclRetriever; +use Magento\Authorization\Model\Acl\AclRetriever; use Magento\Authorization\Model\ResourceModel\Role\Collection as RoleCollection; use Magento\Authorization\Model\ResourceModel\Role\CollectionFactory as RoleCollectionFactory; diff --git a/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php b/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php index d899194bc9e95..8977cafc6b58b 100644 --- a/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php +++ b/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php @@ -6,7 +6,7 @@ namespace Magento\Authorization\Test\Unit\Model; -use \Magento\Authorization\Model\CompositeUserContext; +use Magento\Authorization\Model\CompositeUserContext; use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php index 0246629c9d4b1..a8b6d33927eee 100644 --- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php @@ -5,12 +5,12 @@ */ namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment; -use Magento\Framework\Escaper; -use Magento\Catalog\Helper\Product; +use Magento\Authorizenet\Helper\Backend\Data as DataHelper; use Magento\Backend\App\Action\Context; -use Magento\Framework\View\Result\PageFactory; use Magento\Backend\Model\View\Result\ForwardFactory; -use Magento\Authorizenet\Helper\Backend\Data as DataHelper; +use Magento\Catalog\Helper\Product; +use Magento\Framework\Escaper; +use Magento\Framework\View\Result\PageFactory; /** * Class Place diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php index bc327caffb262..bdb53bce72db8 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php @@ -9,15 +9,15 @@ use Magento\Authorizenet\Helper\DataFactory; use Magento\Checkout\Model\Type\Onepage; use Magento\Framework\App\Action\Context; +use Magento\Framework\App\ObjectManager; use Magento\Framework\App\Response\Http; -use Magento\Framework\Json\Helper\Data as JsonHelper; use Magento\Framework\DataObject; +use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Json\Helper\Data as JsonHelper; use Magento\Framework\Registry; use Magento\Payment\Model\IframeConfigProvider; use Magento\Quote\Api\CartManagementInterface; -use Magento\Framework\Exception\LocalizedException; use Psr\Log\LoggerInterface; -use Magento\Framework\App\ObjectManager; /** * Class Place diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php index 84d91dc89f155..b5328bf9696d7 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php @@ -6,7 +6,6 @@ */ namespace Magento\Authorizenet\Controller\Directpost\Payment; -use Magento\Framework\App\ObjectManager; use Magento\Payment\Block\Transparent\Iframe; /** diff --git a/app/code/Magento/Authorizenet/Helper/Backend/Data.php b/app/code/Magento/Authorizenet/Helper/Backend/Data.php index 327ca9ace841d..55f927948ad47 100644 --- a/app/code/Magento/Authorizenet/Helper/Backend/Data.php +++ b/app/code/Magento/Authorizenet/Helper/Backend/Data.php @@ -6,10 +6,10 @@ namespace Magento\Authorizenet\Helper\Backend; use Magento\Authorizenet\Helper\Data as FrontendDataHelper; +use Magento\Backend\Model\UrlInterface; use Magento\Framework\App\Helper\Context; -use Magento\Store\Model\StoreManagerInterface; use Magento\Sales\Model\OrderFactory; -use Magento\Backend\Model\UrlInterface; +use Magento\Store\Model\StoreManagerInterface; /** * Authorize.net Backend Data Helper diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php index cede4fd7d501b..02355733d5ffa 100644 --- a/app/code/Magento/Authorizenet/Helper/Data.php +++ b/app/code/Magento/Authorizenet/Helper/Data.php @@ -5,12 +5,11 @@ */ namespace Magento\Authorizenet\Helper; +use Magento\Authorizenet\Model\Authorizenet; use Magento\Framework\App\Helper\AbstractHelper; use Magento\Framework\App\Helper\Context; -use Magento\Store\Model\StoreManagerInterface; use Magento\Sales\Model\OrderFactory; -use Magento\Authorizenet\Model\Directpost; -use Magento\Authorizenet\Model\Authorizenet; +use Magento\Store\Model\StoreManagerInterface; /** * Authorize.net Data Helper diff --git a/app/code/Magento/Authorizenet/Model/Authorizenet.php b/app/code/Magento/Authorizenet/Model/Authorizenet.php index ba49d30993e29..634d8786cd030 100644 --- a/app/code/Magento/Authorizenet/Model/Authorizenet.php +++ b/app/code/Magento/Authorizenet/Model/Authorizenet.php @@ -5,7 +5,6 @@ */ namespace Magento\Authorizenet\Model; -use Magento\Authorizenet\Model\TransactionService; use Magento\Framework\HTTP\ZendClientFactory; /** diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php index 1dc4e79c0bdad..2bcf751ae7c12 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost.php +++ b/app/code/Magento/Authorizenet/Model/Directpost.php @@ -5,7 +5,6 @@ */ namespace Magento\Authorizenet\Model; -use Magento\Authorizenet\Model\TransactionService; use Magento\Framework\HTTP\ZendClientFactory; use Magento\Payment\Model\Method\ConfigInterface; use Magento\Payment\Model\Method\TransparentInterface; diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php index 7b53d9ffc0ccc..de0a22ac4327f 100644 --- a/app/code/Magento/Authorizenet/Model/TransactionService.php +++ b/app/code/Magento/Authorizenet/Model/TransactionService.php @@ -9,7 +9,6 @@ use Magento\Framework\HTTP\ZendClientFactory; use Magento\Framework\Simplexml\Element; use Magento\Framework\Xml\Security; -use Magento\Authorizenet\Model\Authorizenet; use Magento\Payment\Model\Method\Logger; /** @@ -95,7 +94,6 @@ public function getTransactionDetails(Authorizenet $context, $transactionId) */ protected function loadTransactionDetails(Authorizenet $context, $transactionId) { - $requestBody = $this->getRequestBody( $context->getConfigData('login'), $context->getConfigData('trans_key'), diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php index e7c91da04bd4c..828fd5268f272 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php @@ -13,6 +13,7 @@ use Magento\Framework\App\Action\Context; use Magento\Framework\App\RequestInterface; use Magento\Framework\App\Response\Http; +use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Json\Helper\Data; use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Registry; @@ -20,7 +21,6 @@ use Magento\Payment\Model\IframeConfigProvider; use Magento\Quote\Api\CartManagementInterface; use Magento\Quote\Model\Quote; -use Magento\Framework\Exception\LocalizedException; /** * Class PlaceTest diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php index 928c5eecba3d3..566aff8b94fb6 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php @@ -5,8 +5,8 @@ */ namespace Magento\Authorizenet\Test\Unit\Model\Directpost; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Authorizenet\Model\Directpost; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class ResponseTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php index 3f8e7cdfdc059..7a87ca201c15d 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php @@ -5,12 +5,12 @@ */ namespace Magento\Authorizenet\Test\Unit\Model; -use Magento\Framework\Simplexml\Element; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Authorizenet\Model\Directpost; -use Magento\Authorizenet\Model\TransactionService; -use Magento\Authorizenet\Model\Request; use Magento\Authorizenet\Model\Directpost\Request\Factory; +use Magento\Authorizenet\Model\Request; +use Magento\Authorizenet\Model\TransactionService; +use Magento\Framework\Simplexml\Element; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Payment\Transaction\Repository as TransactionRepository; diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php index dcf2bfe5d3414..067934fb4e22f 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php @@ -5,9 +5,8 @@ */ namespace Magento\Authorizenet\Test\Unit\Model; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Framework\Simplexml\Element; use Magento\Authorizenet\Model\TransactionService; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class TransactionServiceTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml index 7f3686c21eb24..b34dc2dfcd02d 100644 --- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml +++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml @@ -19,34 +19,34 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
- + escapeHtml(__('FDS Filter Action')); ?>: escapeHtml($fraudDetails['fds_filter_action']); ?>
- + escapeHtml(__('AVS Response')); ?>: escapeHtml($fraudDetails['avs_response']); ?>
- + escapeHtml(__('Card Code Response')); ?>: escapeHtml($fraudDetails['card_code_response']); ?>
- + escapeHtml(__('CAVV Response')); ?>: escapeHtml($fraudDetails['cavv_response']); ?>
- + escapeHtml(__('Fraud Filters')); ?>:
- + escapeHtml($filter['name']); ?>: escapeHtml($filter['action']); ?>
diff --git a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php index 76daf2600b58b..67a24496b06ca 100644 --- a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php +++ b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php @@ -7,8 +7,8 @@ */ namespace Magento\Backend\App\Action\Plugin; -use Magento\Framework\App\RequestInterface; use Magento\Backend\App\AbstractAction; +use Magento\Framework\App\RequestInterface; class MassactionKey { diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php index e48d49d5112e3..ed121d4d7be6c 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Sales.php +++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Block\Dashboard; - /** * Adminhtml dashboard sales statistics bar * diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php index 0e44a793c3422..d733d1d7d1f89 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Totals.php +++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php @@ -11,7 +11,6 @@ */ namespace Magento\Backend\Block\Dashboard; - class Totals extends \Magento\Backend\Block\Dashboard\Bar { /** diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php index 02f7c5ad58e29..2c8b6922d2b97 100644 --- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php +++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php @@ -65,7 +65,7 @@ protected function _prepareForm() 'required' => true ] ); - $renderer = $this->getLayout()->createBlock( + $renderer = $this->getLayout()->createBlock( \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class ); $field->setRenderer($renderer); diff --git a/app/code/Magento/Backend/Block/Widget/Container.php b/app/code/Magento/Backend/Block/Widget/Container.php index 1d823895ea0e8..f813ccc36bb52 100644 --- a/app/code/Magento/Backend/Block/Widget/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Container.php @@ -8,8 +8,6 @@ namespace Magento\Backend\Block\Widget; -use Magento\Framework\View\Element\Template; - class Container extends \Magento\Backend\Block\Template implements ContainerInterface { /**#@+ diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php index 61019178ba4fa..fbb72d7b68aed 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php @@ -37,7 +37,7 @@ class Container extends \Magento\Backend\Block\Widget\Container * @var string */ protected $_blockGroup = 'Magento_Backend'; - + /** * @var string */ diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php index 5e1cc6cb7b2ab..16d5d4f0ae9c6 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php @@ -55,7 +55,7 @@ public function render(DataObject $row) $result .= $this->getColumn()->getEditOnly() ? '' : '' . $this->_getValue($row) . ''; - return $result . $this->_getInputValueElement($row) . '
' ; + return $result . $this->_getInputValueElement($row) . '
'; } return $this->_getValue($row); } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php index 0871d82bf5e68..08152342ffce0 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php @@ -9,7 +9,6 @@ */ namespace Magento\Backend\Block\Widget\Grid\Column\Renderer; - class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer { /** diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php index 50908e2fd6363..231f38d7fafe9 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -64,11 +64,11 @@ public function render(\Magento\Framework\DataObject $row) protected function _getCheckboxHtml($value, $checked) { $id = 'id_' . rand(0, 999); - $html = ''; return $html; } } diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php index d1cae311b90bc..85888d7bbeef2 100644 --- a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php +++ b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php @@ -6,10 +6,10 @@ namespace Magento\Backend\Console\Command; +use Magento\Framework\App\Cache\Manager; use Magento\Framework\Event\ManagerInterface as EventManagerInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Magento\Framework\App\Cache\Manager; abstract class AbstractCacheTypeManageCommand extends AbstractCacheManageCommand { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php index 7cc6a1aaae461..a6fa1c6008235 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php index 1d0e27f943fb3..19b1760318df2 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php index 42ac31f693b8d..012da5400194a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\State; use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; /** * Controller disables some types of cache diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php index 0cf09508c2932..fcbebf91f7582 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\State; use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; /** * Controller enables some types of cache diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php index ed546ba91adec..ad7da4257c048 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php index 91b9ae35ec687..c271c86ed1900 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php @@ -5,11 +5,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Account; -use Magento\Framework\Validator\Exception as ValidatorException; -use Magento\Framework\Exception\AuthenticationException; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\State\UserLockedException; +use Magento\Framework\Validator\Exception as ValidatorException; use Magento\Security\Model\SecurityCookie; /** diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php index d888c74c02bfd..be6a943f37b67 100644 --- a/app/code/Magento/Backend/Model/Auth.php +++ b/app/code/Magento/Backend/Model/Auth.php @@ -176,7 +176,7 @@ public function login($username, $password) ['user_name' => $username, 'exception' => $e] ); self::throwException( - __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.') + __($e->getMessage() ?: 'You did not sign in correctly or your account is temporarily disabled.') ); } } diff --git a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php index 2fc8eeac8c994..a4e828dafcc0e 100644 --- a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php +++ b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php @@ -26,7 +26,7 @@ public function beforeSave() throw new LocalizedException( __('Admin session lifetime must be less than or equal to 31536000 seconds (one year)') ); - } else if ($value < self::MIN_LIFETIME) { + } elseif ($value < self::MIN_LIFETIME) { throw new LocalizedException( __('Admin session lifetime must be greater than or equal to 60 seconds') ); diff --git a/app/code/Magento/Backend/Model/Locale/Manager.php b/app/code/Magento/Backend/Model/Locale/Manager.php index 7f2fa2d5e5a4c..21b5d4672e053 100644 --- a/app/code/Magento/Backend/Model/Locale/Manager.php +++ b/app/code/Magento/Backend/Model/Locale/Manager.php @@ -26,7 +26,7 @@ class Manager * @var \Magento\Framework\TranslateInterface */ protected $_translator; - + /** * @var \Magento\Backend\App\ConfigInterface */ @@ -61,16 +61,16 @@ public function __construct( public function switchBackendInterfaceLocale($localeCode) { $this->_session->setSessionLocale(null); - + $this->_authSession->getUser()->setInterfaceLocale($localeCode); - + $this->_translator->setLocale($localeCode)->loadData(null, true); - + return $this; } /** - * Get general interface locale + * Get general interface locale * * @return string */ @@ -88,13 +88,13 @@ public function getUserInterfaceLocale() { $userData = $this->_authSession->getUser(); $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE; - + if ($userData && $userData->getInterfaceLocale()) { $interfaceLocale = $userData->getInterfaceLocale(); } elseif ($this->getGeneralLocale()) { $interfaceLocale = $this->getGeneralLocale(); } - + return $interfaceLocale; } } diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php index 9275f3115d5fd..b698e528489f7 100644 --- a/app/code/Magento/Backend/Model/Session/Quote.php +++ b/app/code/Magento/Backend/Model/Session/Quote.php @@ -150,7 +150,7 @@ public function getQuote() $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId()); $this->_quote->setIsActive(false); $this->_quote->setStoreId($this->getStoreId()); - + $this->quoteRepository->save($this->_quote); $this->setQuoteId($this->_quote->getId()); $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]); diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php index 53d350f976b5d..2f0799f8b5f54 100644 --- a/app/code/Magento/Backend/Model/Url.php +++ b/app/code/Magento/Backend/Model/Url.php @@ -5,8 +5,8 @@ */ namespace Magento\Backend\Model; -use Magento\Framework\Url\HostChecker; use Magento\Framework\App\ObjectManager; +use Magento\Framework\Url\HostChecker; /** * Class \Magento\Backend\Model\UrlInterface diff --git a/app/code/Magento/Backend/Model/View/Layout/Builder.php b/app/code/Magento/Backend/Model/View/Layout/Builder.php index 2338e7bb867e5..85d547c07efd7 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Builder.php +++ b/app/code/Magento/Backend/Model/View/Layout/Builder.php @@ -5,10 +5,6 @@ */ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\App; -use Magento\Framework\Event; -use Magento\Framework\View; - class Builder extends \Magento\Framework\View\Layout\Builder { /** diff --git a/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php b/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php index 033ce511d8ec7..a1d59b151d802 100644 --- a/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php +++ b/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php @@ -19,7 +19,7 @@ * * * - * + * * Registered condition can be used by ui component declaration in layout * * diff --git a/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php b/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php index ff73b8c519824..c6aec114047de 100644 --- a/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php +++ b/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php @@ -5,12 +5,12 @@ */ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Exception\InputException; +use Magento\Framework\ObjectManagerInterface; /** * Class ConditionPool - * + * * Registry for \Magento\Backend\Model\View\Layout\ConditionInterface * @see usage details in \Magento\Backend\Model\View\Layout\ConditionInterface description * diff --git a/app/code/Magento/Backend/Model/View/Layout/Filter/Acl.php b/app/code/Magento/Backend/Model/View/Layout/Filter/Acl.php index ac2e86efeb62e..3dc36e5714bd7 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Filter/Acl.php +++ b/app/code/Magento/Backend/Model/View/Layout/Filter/Acl.php @@ -7,11 +7,11 @@ */ namespace Magento\Backend\Model\View\Layout\Filter; -use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Framework\View\Layout\Data\Structure; use Magento\Backend\Model\View\Layout\FilterInterface; use Magento\Backend\Model\View\Layout\StructureManager; use Magento\Framework\App\ObjectManager; +use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class Acl diff --git a/app/code/Magento/Backend/Model/View/Layout/Filter/Condition.php b/app/code/Magento/Backend/Model/View/Layout/Filter/Condition.php index cbb72ccb51cc1..2dc316c4e3d34 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Filter/Condition.php +++ b/app/code/Magento/Backend/Model/View/Layout/Filter/Condition.php @@ -5,11 +5,11 @@ */ namespace Magento\Backend\Model\View\Layout\Filter; +use Magento\Backend\Model\View\Layout\ConditionPool; use Magento\Backend\Model\View\Layout\FilterInterface; use Magento\Backend\Model\View\Layout\StructureManager; use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Backend\Model\View\Layout\ConditionPool; /** * Class Condition diff --git a/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php b/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php index a1b0a302c0f66..b2ce24c481c12 100644 --- a/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php +++ b/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php @@ -6,8 +6,8 @@ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\View\Layout\ScheduledStructure; use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Interface FilterInterface @@ -23,7 +23,7 @@ * * * - * + * */ interface FilterInterface { diff --git a/app/code/Magento/Backend/Model/View/Layout/GeneratorPool.php b/app/code/Magento/Backend/Model/View/Layout/GeneratorPool.php index a34d5929d5db7..34fabe82679d7 100644 --- a/app/code/Magento/Backend/Model/View/Layout/GeneratorPool.php +++ b/app/code/Magento/Backend/Model/View/Layout/GeneratorPool.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\App\ObjectManager; +use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Pool of generators for structural elements diff --git a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php index 150a0c7a82191..cc3fcc14e1772 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php +++ b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php @@ -5,8 +5,8 @@ */ namespace Magento\Backend\Model\View\Layout\Reader; -use Magento\Framework\View\Layout; use Magento\Framework\Data\Argument\InterpreterInterface; +use Magento\Framework\View\Layout; /** * Backend block structure reader with ACL support diff --git a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php index d3bc6ebed6e21..f93591a1aef75 100644 --- a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php +++ b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php @@ -6,8 +6,8 @@ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\View\Layout\ScheduledStructure; use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class StructureManager diff --git a/app/code/Magento/Backend/Model/View/Page/Builder.php b/app/code/Magento/Backend/Model/View/Page/Builder.php index 8b0fe73604137..2c2409736941c 100644 --- a/app/code/Magento/Backend/Model/View/Page/Builder.php +++ b/app/code/Magento/Backend/Model/View/Page/Builder.php @@ -6,8 +6,6 @@ namespace Magento\Backend\Model\View\Page; use Magento\Backend\Model\View\Layout; -use Magento\Framework\App; -use Magento\Framework\Event; use Magento\Framework\View; class Builder extends View\Page\Builder diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php index fdddb13b3b611..61915aaae7291 100644 --- a/app/code/Magento/Backend/Model/View/Result/Page.php +++ b/app/code/Magento/Backend/Model/View/Result/Page.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Model\View\Result; -use Magento\Framework\Translate; use Magento\Framework\View; class Page extends View\Result\Page diff --git a/app/code/Magento/Backend/Model/View/Result/Redirect.php b/app/code/Magento/Backend/Model/View/Result/Redirect.php index eb93154f7e346..327dcf77604d7 100644 --- a/app/code/Magento/Backend/Model/View/Result/Redirect.php +++ b/app/code/Magento/Backend/Model/View/Result/Redirect.php @@ -7,7 +7,6 @@ use Magento\Backend\App\AbstractAction; use Magento\Backend\Model\Session; -use Magento\Backend\Model\UrlInterface; use Magento\Framework\App; use Magento\Framework\App\ActionFlag; use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface; diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php index 39e50220ad3ff..4fc96f468052c 100644 --- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php +++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php @@ -5,12 +5,12 @@ */ namespace Magento\Backend\Setup; +use Magento\Framework\App\DeploymentConfig; use Magento\Framework\Config\Data\ConfigData; use Magento\Framework\Config\File\ConfigFilePool; +use Magento\Framework\Setup\BackendFrontnameGenerator; use Magento\Framework\Setup\ConfigOptionsListInterface; use Magento\Framework\Setup\Option\TextConfigOption; -use Magento\Framework\App\DeploymentConfig; -use \Magento\Framework\Setup\BackendFrontnameGenerator; /* * Deployment configuration options needed for Backend module diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php index 8f626dba2d024..283b53b450702 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php @@ -5,8 +5,8 @@ */ namespace Magento\Backend\Test\Unit\App\Action\Plugin; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Backend\App\Action\Plugin\Authentication; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; /** * Class AuthenticationTest @@ -120,7 +120,7 @@ public function testProcessNotLoggedInUser($isIFrameParam, $isAjaxParam, $isForw if ($isIFrameParam) { $getParamCalls = 1; $actionName = 'deniedIframe'; - } else if ($isAjaxParam) { + } elseif ($isAjaxParam) { $getParamCalls = 2; $actionName = 'deniedJson'; } else { diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php index e27650a12ffa1..e20dc56217066 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Test\Unit\App\Action\Plugin; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Backend\App\AbstractAction; use Magento\Framework\App\RequestInterface; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class MassactionKeyTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php b/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php index a8a520960e768..92b5945ce89f9 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php @@ -5,10 +5,10 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; +use Magento\Backend\Block\AnchorRenderer; use Magento\Backend\Block\MenuItemChecker; +use Magento\Backend\Model\Menu\Item; use Magento\Framework\Escaper; -use Magento\Backend\Block\AnchorRenderer; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class AnchorRendererTest extends \PHPUnit_Framework_TestCase diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php index 603f825518d4a..aa4f83dc397ad 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; -use Magento\Backend\Model\Menu; use Magento\Backend\Block\MenuItemChecker; +use Magento\Backend\Model\Menu; +use Magento\Backend\Model\Menu\Item; class MenuItemCheckerTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php index ccc0e719aaecb..dbfab8de1bbab 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php @@ -5,16 +5,16 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; -use Magento\Backend\Model\Menu as MenuModel; +use Magento\Backend\Block\AnchorRenderer; use Magento\Backend\Block\Menu; -use Magento\Backend\Model\UrlInterface; -use Magento\Backend\Model\Menu\Filter\IteratorFactory; +use Magento\Backend\Block\MenuItemChecker; use Magento\Backend\Model\Auth\Session; +use Magento\Backend\Model\Menu as MenuModel; use Magento\Backend\Model\Menu\Config; +use Magento\Backend\Model\Menu\Filter\IteratorFactory; +use Magento\Backend\Model\Menu\Item; +use Magento\Backend\Model\UrlInterface; use Magento\Framework\Locale\ResolverInterface; -use Magento\Backend\Block\MenuItemChecker; -use Magento\Backend\Block\AnchorRenderer; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class MenuTest extends \PHPUnit_Framework_TestCase diff --git a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php index 2eba4779d91e6..59a6b3463f582 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php @@ -11,7 +11,7 @@ /** * Class ResetTest - * @deprecated + * @deprecated * @package Magento\Backend\Test\Unit\Block\Page\System\Config\Robots */ class ResetTest extends \PHPUnit_Framework_TestCase diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php index d9ea144372445..c0b2f06f06b00 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php @@ -48,7 +48,7 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $context = $objectHelper->getObject( + $context = $objectHelper->getObject( \Magento\Backend\App\Action\Context::class, [ 'objectManager' => $this->objectManagerMock, @@ -58,9 +58,9 @@ protected function setUp() ] ); - $this->controller = $objectHelper->getObject( + $this->controller = $objectHelper->getObject( \Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles::class, - ['context' => $context,] + ['context' => $context] ); } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php index 9a0a2615ca893..8543734f27c14 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php @@ -5,17 +5,17 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Magento\Backend\Controller\Adminhtml\Cache\MassDisable; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\App\State; use Magento\Backend\App\Action\Context; -use Magento\Framework\Message\ManagerInterface as MessageManager; -use Magento\Framework\Controller\ResultFactory; +use Magento\Backend\Controller\Adminhtml\Cache\MassDisable; use Magento\Backend\Model\View\Result\Redirect; -use Magento\Framework\App\RequestInterface as Request; -use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; use Magento\Framework\App\Cache\StateInterface as CacheState; +use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; +use Magento\Framework\App\RequestInterface as Request; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Message\ManagerInterface as MessageManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php index aff391e033209..c2facf6ad0b68 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php @@ -5,17 +5,17 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Magento\Backend\Controller\Adminhtml\Cache\MassEnable; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\App\State; use Magento\Backend\App\Action\Context; -use Magento\Framework\Message\ManagerInterface as MessageManager; -use Magento\Framework\Controller\ResultFactory; +use Magento\Backend\Controller\Adminhtml\Cache\MassEnable; use Magento\Backend\Model\View\Result\Redirect; -use Magento\Framework\App\RequestInterface as Request; -use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; use Magento\Framework\App\Cache\StateInterface as CacheState; +use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; +use Magento\Framework\App\RequestInterface as Request; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Message\ManagerInterface as MessageManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php index 16e109b516410..51a9f95cf2569 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php @@ -25,8 +25,7 @@ protected function assertExecute($controllerName, $blockName) $outPut = "data"; $resultRawMock = $this->getMock( \Magento\Framework\Controller\Result\Raw::class, - ['setContents'], [], '', false) - ; + ['setContents'], [], '', false); $resultRawFactoryMock = $this->getMock( \Magento\Framework\Controller\Result\RawFactory::class, ['create'], [], '', false diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php index d65dee798b367..4b3d0450c7c71 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php @@ -6,9 +6,9 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\System\Store; -use Magento\Framework\Controller\ResultFactory; -use Magento\Backend\Model\View\Result\Page; use Magento\Backend\Controller\Adminhtml\System\Store\Index; +use Magento\Backend\Model\View\Result\Page; +use Magento\Framework\Controller\ResultFactory; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\View\Page\Config; use Magento\Framework\View\Page\Title; diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php index 8dc5d8eafcbfc..dd341cf36bbe0 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php @@ -6,7 +6,6 @@ namespace Magento\Backend\Test\Unit\Model; use Magento\Backend\Model\AdminPathConfig; -use Magento\Store\Model\Store; class AdminPathConfigTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php index e09ef22d35900..c18a2fd9f2451 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php @@ -28,7 +28,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session */ protected $_authSession; - + /** * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface */ @@ -45,14 +45,14 @@ protected function setUp() '', false ); - + $this->_backendConfig = $this->getMockForAbstractClass( \Magento\Backend\App\ConfigInterface::class, [], '', false ); - + $userMock = new \Magento\Framework\DataObject(); $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock)); diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php index 7d972aa2792e1..b297e64e2f756 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php @@ -37,6 +37,6 @@ public function testAfterGetResult($isPub, $times) public function afterGetResultDataProvider() { - return [[true, 1], [false, 0],]; + return [[true, 1], [false, 0]]; } } diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php index 6b45345cef321..d68b6c91e2b34 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Test\Unit\Model; -use Magento\Backend\Model\Menu\Item; use Magento\Backend\Model\Menu\Item\Factory; use Magento\Framework\Serialize\SerializerInterface; diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/AclTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/AclTest.php index 9eb02e568439f..8fb08d9b160e5 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/AclTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/AclTest.php @@ -5,10 +5,10 @@ */ namespace Magento\Backend\Test\Unit\Model\View\Layout\Filter; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Backend\Model\View\Layout\Filter\Acl; use Magento\Backend\Model\View\Layout\StructureManager; use Magento\Framework\AuthorizationInterface; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class AclTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/ConditionTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/ConditionTest.php index dacfbac3c4aa7..da94f4158ae23 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/ConditionTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/Filter/ConditionTest.php @@ -6,12 +6,12 @@ namespace Magento\Backend\Test\Unit\Model\View\Layout\Filter; use Magento\Backend\Model\View\Layout\ConditionInterface; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\Backend\Model\View\Layout\ConditionPool; use Magento\Backend\Model\View\Layout\Filter\Condition; use Magento\Backend\Model\View\Layout\StructureManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Backend\Model\View\Layout\ConditionPool; class ConditionTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/FilterTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/FilterTest.php index 0a51c9c1c56f3..7cf1652bef696 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/FilterTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/FilterTest.php @@ -6,8 +6,8 @@ namespace Magento\Backend\Test\Unit\Model\View\Layout; -use Magento\Backend\Model\View\Layout\FilterInterface; use Magento\Backend\Model\View\Layout\Filter; +use Magento\Backend\Model\View\Layout\FilterInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\View\Layout\ScheduledStructure; @@ -47,8 +47,7 @@ public function setUp() $this->filter = $objectManager->getObject( Filter::class, [ - 'filters' => - [ + 'filters' => [ 'filter1' => $this->someFilterMock ] ] diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php index a5a9055c0d03f..1d7e189adb9d5 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php @@ -7,9 +7,9 @@ namespace Magento\Backend\Test\Unit\Model\View\Layout; use Magento\Backend\Model\View\Layout\StructureManager; -use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class StructureManagerTest diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml index 153852ec9d2a6..1d36a0944a52f 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml @@ -15,8 +15,8 @@ onchange="changeDiagramsPeriod(this);" class="admin__control-select"> helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?> + continue; +} ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml index 278db20774f71..6f318224090db 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml @@ -61,8 +61,8 @@ deps.push('Magento_Sales/order/create/form'); deps.push('mage/adminhtml/grid'); -require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ - +require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ + getDependencyJsObject()): ?> registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml index f85b3b61b587f..c2598e9f7d9e6 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -36,22 +36,25 @@