From f08c3bf8f70e8f13da1ca3efa8440846297f0c76 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Sun, 13 Jan 2019 15:31:33 +0100 Subject: [PATCH] Apply coding standard fixes --- app/migrations/Version20161202011555.php | 11 ++++++++++- app/migrations/Version20161209095131.php | 17 ++++++++++------- app/migrations/Version20161214153137.php | 15 ++++++++++++--- app/migrations/Version20161215103325.php | 11 ++++++++++- app/migrations/Version20161219160441.php | 15 ++++++++++++--- app/migrations/Version20161220092422.php | 13 ++++++++++--- app/migrations/Version20161221133514.php | 11 ++++++++++- app/migrations/Version20161223091334.php | 11 ++++++++++- app/migrations/Version20161223164558.php | 11 ++++++++++- app/migrations/Version20170103120334.php | 11 ++++++++++- app/migrations/Version20170109143010.php | 13 +++++++++++-- app/migrations/Version20170110120125.php | 11 ++++++++++- app/migrations/Version20170116215417.php | 11 ++++++++++- app/migrations/Version20170117075436.php | 11 ++++++++++- app/migrations/Version20170120164250.php | 11 ++++++++++- app/migrations/Version20170124221955.php | 11 ++++++++++- app/migrations/Version20170201094058.php | 11 ++++++++++- app/migrations/Version20170206122839.php | 11 ++++++++++- app/migrations/Version20170206141520.php | 11 ++++++++++- app/migrations/Version20170208102345.php | 11 ++++++++++- app/migrations/Version20170208103250.php | 11 ++++++++++- app/migrations/Version20170214095710.php | 11 ++++++++++- app/migrations/Version20170214104908.php | 11 ++++++++++- app/migrations/Version20170215143031.php | 11 ++++++++++- app/migrations/Version20170217141621.php | 11 ++++++++++- app/migrations/Version20170220150813.php | 11 ++++++++++- app/migrations/Version20170223071604.php | 11 ++++++++++- app/migrations/Version20170301135010.php | 11 ++++++++++- app/migrations/Version20170303170201.php | 11 ++++++++++- app/migrations/Version20170313125424.php | 11 ++++++++++- app/migrations/Version20170321131352.php | 11 ++++++++++- app/migrations/Version20170327135945.php | 11 ++++++++++- app/migrations/Version20170401200415.php | 11 ++++++++++- app/migrations/Version20170518123056.php | 11 ++++++++++- app/migrations/Version20170711151342.php | 9 +++++++++ app/migrations/Version20170824124122.php | 11 ++++++++++- app/migrations/Version20170913125128.php | 11 ++++++++++- app/migrations/Version20171003103916.php | 11 ++++++++++- app/migrations/Version20180102140039.php | 11 ++++++++++- app/migrations/Version20180226142349.php | 13 +++++++++++-- app/migrations/Version20190109095211.php | 9 +++++++++ app/migrations/Version20190109160409.php | 9 +++++++++ config/bootstrap.php | 10 ++++++---- public/index.php | 4 +++- .../ManagingChannelsBillingDataContext.php | 9 +++++++++ .../Admin/Channel/ShopBillingDataElement.php | 9 +++++++++ .../Channel/ShopBillingDataElementInterface.php | 9 +++++++++ .../CustomerDefaultAddressListener.php | 6 ------ .../Form/Type/ShopBillingDataType.php | 10 +++++++++- .../Factory/UserWithEncoderFactory.php | 9 +++++++++ .../SyliusUserExtensionTest.php | 9 +++++++++ .../UpdateUserEncoderListenerSpec.php | 9 +++++++++ .../spec/Factory/UserWithEncoderFactorySpec.php | 9 +++++++++ .../Core/spec/Model/ShopBillingDataSpec.php | 9 +++++++++ .../UpdatingUserPasswordEncoderTest.php | 13 +++++++++++-- 55 files changed, 524 insertions(+), 67 deletions(-) diff --git a/app/migrations/Version20161202011555.php b/app/migrations/Version20161202011555.php index 6d387fedc06..4d13b568827 100644 --- a/app/migrations/Version20161202011555.php +++ b/app/migrations/Version20161202011555.php @@ -1,11 +1,20 @@ container->get('sylius.repository.zone'); $entityManager = $this->container->get('doctrine.orm.default_entity_manager'); @@ -41,7 +45,6 @@ public function up(Schema $schema): void public function down(Schema $schema): void { - $zoneRepository = $this->container->get('sylius.repository.zone'); $entityManager = $this->container->get('doctrine.orm.default_entity_manager'); diff --git a/app/migrations/Version20161214153137.php b/app/migrations/Version20161214153137.php index 56d06a9adce..ba297f80337 100644 --- a/app/migrations/Version20161214153137.php +++ b/app/migrations/Version20161214153137.php @@ -1,11 +1,20 @@ addSql('CREATE TABLE sylius_product_variant_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_8DC18EDC2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_variant_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); $this->addSql('ALTER TABLE sylius_product_variant_translation ADD CONSTRAINT FK_8DC18EDC2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_variant (id) ON DELETE CASCADE'); - $this->addSql('INSERT INTO sylius_product_variant_translation (translatable_id, name, locale) SELECT id, name, "'.$defaultLocale.'" from sylius_product_variant WHERE sylius_product_variant.name IS NOT null'); + $this->addSql('INSERT INTO sylius_product_variant_translation (translatable_id, name, locale) SELECT id, name, "' . $defaultLocale . '" from sylius_product_variant WHERE sylius_product_variant.name IS NOT null'); $this->addSql('ALTER TABLE sylius_product_variant DROP name'); } @@ -38,7 +47,7 @@ public function down(Schema $schema): void $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); $this->addSql('ALTER TABLE sylius_product_variant ADD name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci'); - $this->addSql('UPDATE sylius_product_variant SET name = (SELECT name FROM sylius_product_variant_translation WHERE sylius_product_variant_translation.translatable_id = sylius_product_variant.id AND sylius_product_variant_translation.locale = "'.$defaultLocale.'")'); + $this->addSql('UPDATE sylius_product_variant SET name = (SELECT name FROM sylius_product_variant_translation WHERE sylius_product_variant_translation.translatable_id = sylius_product_variant.id AND sylius_product_variant_translation.locale = "' . $defaultLocale . '")'); $this->addSql('DROP TABLE sylius_product_variant_translation'); } } diff --git a/app/migrations/Version20161215103325.php b/app/migrations/Version20161215103325.php index dfbe25c6cd6..851186bffde 100644 --- a/app/migrations/Version20161215103325.php +++ b/app/migrations/Version20161215103325.php @@ -1,11 +1,20 @@ addSql('CREATE TABLE sylius_product_association_type_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_4F618E52C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_association_type_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); $this->addSql('ALTER TABLE sylius_product_association_type_translation ADD CONSTRAINT FK_4F618E52C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_association_type (id) ON DELETE CASCADE'); - $this->addSql('INSERT INTO sylius_product_association_type_translation (translatable_id, name, locale) SELECT id, name, "'.$defaultLocale.'" from sylius_product_association_type WHERE sylius_product_association_type.name IS NOT null'); + $this->addSql('INSERT INTO sylius_product_association_type_translation (translatable_id, name, locale) SELECT id, name, "' . $defaultLocale . '" from sylius_product_association_type WHERE sylius_product_association_type.name IS NOT null'); $this->addSql('ALTER TABLE sylius_product_association_type DROP name'); } @@ -38,7 +47,7 @@ public function down(Schema $schema): void $defaultLocale = $this->container->getParameter('locale'); $this->addSql('ALTER TABLE sylius_product_association_type ADD name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); - $this->addSql('UPDATE sylius_product_association_type SET name = (SELECT name FROM sylius_product_association_type_translation WHERE sylius_product_association_type_translation.translatable_id = sylius_product_association_type.id AND sylius_product_association_type_translation.locale = "'.$defaultLocale.'")'); + $this->addSql('UPDATE sylius_product_association_type SET name = (SELECT name FROM sylius_product_association_type_translation WHERE sylius_product_association_type_translation.translatable_id = sylius_product_association_type.id AND sylius_product_association_type_translation.locale = "' . $defaultLocale . '")'); $this->addSql('DROP TABLE sylius_product_association_type_translation'); } } diff --git a/app/migrations/Version20161220092422.php b/app/migrations/Version20161220092422.php index 2135b3c4fe8..19809f92b99 100644 --- a/app/migrations/Version20161220092422.php +++ b/app/migrations/Version20161220092422.php @@ -1,15 +1,23 @@ abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); @@ -17,7 +25,6 @@ public function up(Schema $schema): void $this->addSql('CREATE TABLE sylius_address_log_entries (id INT AUTO_INCREMENT NOT NULL, action VARCHAR(255) NOT NULL, loggedAt DATETIME NOT NULL, objectId VARCHAR(64) DEFAULT NULL, objectClass VARCHAR(255) NOT NULL, version INT NOT NULL, data LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', username VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); } - public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); diff --git a/app/migrations/Version20161221133514.php b/app/migrations/Version20161221133514.php index ed37310f7ec..1933957e2a6 100644 --- a/app/migrations/Version20161221133514.php +++ b/app/migrations/Version20161221133514.php @@ -1,11 +1,20 @@ container->getParameter('locale'); $this->addSql('ALTER TABLE sylius_product_attribute_value ADD locale_code VARCHAR(255) NOT NULL'); - $this->addSql('UPDATE sylius_product_attribute_value SET locale_code = "'.$defaultLocale.'"'); + $this->addSql('UPDATE sylius_product_attribute_value SET locale_code = "' . $defaultLocale . '"'); } public function down(Schema $schema): void diff --git a/app/migrations/Version20170110120125.php b/app/migrations/Version20170110120125.php index 9dd6b7ca5c6..3b124a346ab 100644 --- a/app/migrations/Version20170110120125.php +++ b/app/migrations/Version20170110120125.php @@ -1,11 +1,20 @@ =1.2) -if (is_array($env = @include dirname(__DIR__).'/.env.local.php')) { +if (is_array($env = @include dirname(__DIR__) . '/.env.local.php')) { $_SERVER += $env; $_ENV += $env; } elseif (!class_exists(Dotenv::class)) { throw new RuntimeException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.'); } else { // load all the .env files - (new Dotenv())->loadEnv(dirname(__DIR__).'/.env'); + (new Dotenv())->loadEnv(dirname(__DIR__) . '/.env'); } $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev'; $_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV']; -$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0'; +$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], \FILTER_VALIDATE_BOOLEAN) ? '1' : '0'; diff --git a/public/index.php b/public/index.php index e30f90c0357..7509d6ad2b8 100644 --- a/public/index.php +++ b/public/index.php @@ -1,10 +1,12 @@ setAddressAsDefault($address); } - /** - * @param AddressInterface $address - */ private function setAddressAsDefault(AddressInterface $address): void { if (null !== $address->getId()) { diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/ShopBillingDataType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/ShopBillingDataType.php index cb98bab3dec..0771fd6d014 100644 --- a/src/Sylius/Bundle/CoreBundle/Form/Type/ShopBillingDataType.php +++ b/src/Sylius/Bundle/CoreBundle/Form/Type/ShopBillingDataType.php @@ -1,11 +1,19 @@ submitForm('Login', [ '_username' => 'Oliver@doe.com', - '_password' => 'testpassword' + '_password' => 'testpassword', ]); Assert::assertSame(200, $this->client->getResponse()->getStatusCode()); @@ -85,7 +94,7 @@ public function it_updates_the_encoder_when_the_admin_user_logs_in(): void $this->submitForm('Login', [ '_username' => 'user@example.com', - '_password' => 'testpassword' + '_password' => 'testpassword', ]); Assert::assertSame(200, $this->client->getResponse()->getStatusCode());