From 923a8962ee85a3723cd7a481762b1ecf29614a99 Mon Sep 17 00:00:00 2001 From: Volodymyr Lunov Date: Mon, 6 Jun 2016 15:21:21 +0200 Subject: [PATCH 01/29] 2130: autocomplete is off for passwords fields. --- src/Pyz/Yves/Customer/Form/LoginForm.php | 1 + src/Pyz/Yves/Customer/Form/RegisterForm.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/Pyz/Yves/Customer/Form/LoginForm.php b/src/Pyz/Yves/Customer/Form/LoginForm.php index 9beb1b75a..498447ba5 100644 --- a/src/Pyz/Yves/Customer/Form/LoginForm.php +++ b/src/Pyz/Yves/Customer/Form/LoginForm.php @@ -73,6 +73,7 @@ protected function addPasswordField(FormBuilderInterface $builder) 'label' => 'customer.login.password', 'constraints' => new NotBlank(), 'mapped' => false, + 'attr' => ['autocomplete' => 'off',] ]); return $this; diff --git a/src/Pyz/Yves/Customer/Form/RegisterForm.php b/src/Pyz/Yves/Customer/Form/RegisterForm.php index 556248dab..90075d76d 100644 --- a/src/Pyz/Yves/Customer/Form/RegisterForm.php +++ b/src/Pyz/Yves/Customer/Form/RegisterForm.php @@ -137,9 +137,11 @@ protected function addPasswordField(FormBuilderInterface $builder) 'required' => true, 'first_options' => [ 'label' => 'forms.password', + 'attr' => ['autocomplete' => 'off',] ], 'second_options' => [ 'label' => 'forms.confirm-password', + 'attr' => ['autocomplete' => 'off',] ], 'constraints' => [ new NotBlank(), From ea5f270b60c6a668d34eab52604b3490cb4f0806 Mon Sep 17 00:00:00 2001 From: Volodymyr Lunov Date: Mon, 6 Jun 2016 15:24:25 +0200 Subject: [PATCH 02/29] 2130: added lock file. --- composer.lock | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 6f420dd7a..80b365675 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", - "content-hash": "acc38c61be29eba8e913c8f9f5103d30", + "hash": "cb220e10a472288581893c22e3407596", + "content-hash": "0718377da637a8cc05c2d795715adc88", "packages": [ { "name": "container-interop/container-interop", @@ -945,11 +945,11 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/2130-LIVE07-Password-field-with-autocomplete", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "35f899eb7133ee92c16b1f8153838504de8961b5" + "reference": "b6c990331f6017fb49a443a83c0b84d8d5cc93fb" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1021,6 +1021,9 @@ "Spryker\\Client\\CategoryExporter\\": "Bundles/CategoryExporter/src", "Spryker\\Shared\\CategoryExporter\\": "Bundles/CategoryExporter/src", "Spryker\\Client\\Checkout\\": "Bundles/Checkout/src", + "Spryker\\Yves\\Checkout\\": "Bundles/Checkout/src", + "Spryker\\Yves\\StepEngine\\": "Bundles/StepEngine/src", + "Unit\\Spryker\\Yves\\StepEngine\\": "Bundles/StepEngine/tests", "Unit\\Spryker\\Client\\Checkout\\": "Bundles/Checkout/tests", "Functional\\Spryker\\Client\\Checkout\\": "Bundles/Checkout/tests", "Spryker\\Shared\\Checkout\\": "Bundles/Checkout/src", @@ -1192,6 +1195,7 @@ "Unit\\Spryker\\Zed\\Payment\\": "Bundles/Payment/tests", "Functional\\Spryker\\Zed\\Payment\\": "Bundles/Payment/tests", "Spryker\\Client\\Payolution\\": "Bundles/Payolution/src", + "Spryker\\Yves\\Payolution\\": "Bundles/Payolution/src", "Unit\\Spryker\\Client\\Payolution\\": "Bundles/Payolution/tests", "Functional\\Spryker\\Client\\Payolution\\": "Bundles/Payolution/tests", "Spryker\\Shared\\Payolution\\": "Bundles/Payolution/src", @@ -1408,7 +1412,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-03 12:10:38" + "time": "2016-06-06 13:20:36" }, { "name": "symfony-cmf/routing", From 4c1cd247c465fbe84aff842ff371894a4741fa31 Mon Sep 17 00:00:00 2001 From: Volodymyr Lunov Date: Mon, 6 Jun 2016 15:33:49 +0200 Subject: [PATCH 03/29] Fixed phpcs. --- src/Pyz/Yves/Customer/Form/LoginForm.php | 2 +- src/Pyz/Yves/Customer/Form/RegisterForm.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Pyz/Yves/Customer/Form/LoginForm.php b/src/Pyz/Yves/Customer/Form/LoginForm.php index 498447ba5..fd157a2ec 100644 --- a/src/Pyz/Yves/Customer/Form/LoginForm.php +++ b/src/Pyz/Yves/Customer/Form/LoginForm.php @@ -73,7 +73,7 @@ protected function addPasswordField(FormBuilderInterface $builder) 'label' => 'customer.login.password', 'constraints' => new NotBlank(), 'mapped' => false, - 'attr' => ['autocomplete' => 'off',] + 'attr' => ['autocomplete' => 'off', ] ]); return $this; diff --git a/src/Pyz/Yves/Customer/Form/RegisterForm.php b/src/Pyz/Yves/Customer/Form/RegisterForm.php index 90075d76d..1d04e11ce 100644 --- a/src/Pyz/Yves/Customer/Form/RegisterForm.php +++ b/src/Pyz/Yves/Customer/Form/RegisterForm.php @@ -137,11 +137,11 @@ protected function addPasswordField(FormBuilderInterface $builder) 'required' => true, 'first_options' => [ 'label' => 'forms.password', - 'attr' => ['autocomplete' => 'off',] + 'attr' => ['autocomplete' => 'off', ] ], 'second_options' => [ 'label' => 'forms.confirm-password', - 'attr' => ['autocomplete' => 'off',] + 'attr' => ['autocomplete' => 'off', ] ], 'constraints' => [ new NotBlank(), From 97c1ff2ba4e17ee59df7a34d068158cfefc0b9ab Mon Sep 17 00:00:00 2001 From: Volodymyr Lunov Date: Mon, 6 Jun 2016 15:42:04 +0200 Subject: [PATCH 04/29] Fixed phpcs. --- src/Pyz/Yves/Customer/Form/LoginForm.php | 2 +- src/Pyz/Yves/Customer/Form/PasswordForm.php | 8 ++------ src/Pyz/Yves/Customer/Form/RegisterForm.php | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Pyz/Yves/Customer/Form/LoginForm.php b/src/Pyz/Yves/Customer/Form/LoginForm.php index fd157a2ec..0a37d876a 100644 --- a/src/Pyz/Yves/Customer/Form/LoginForm.php +++ b/src/Pyz/Yves/Customer/Form/LoginForm.php @@ -73,7 +73,7 @@ protected function addPasswordField(FormBuilderInterface $builder) 'label' => 'customer.login.password', 'constraints' => new NotBlank(), 'mapped' => false, - 'attr' => ['autocomplete' => 'off', ] + 'attr' => ['autocomplete' => 'off'] ]); return $this; diff --git a/src/Pyz/Yves/Customer/Form/PasswordForm.php b/src/Pyz/Yves/Customer/Form/PasswordForm.php index ca426a0c1..52bf7160b 100644 --- a/src/Pyz/Yves/Customer/Form/PasswordForm.php +++ b/src/Pyz/Yves/Customer/Form/PasswordForm.php @@ -52,15 +52,11 @@ protected function addNewPasswordField(FormBuilderInterface $builder) 'required' => true, 'first_options' => [ 'label' => 'customer.password.request.new_password', - 'attr' => [ - 'autocomplete' => 'off', - ], + 'attr' => ['autocomplete' => 'off'], ], 'second_options' => [ 'label' => 'customer.password.confirm.new_password', - 'attr' => [ - 'autocomplete' => 'off', - ], + 'attr' => ['autocomplete' => 'off'], ], ]); diff --git a/src/Pyz/Yves/Customer/Form/RegisterForm.php b/src/Pyz/Yves/Customer/Form/RegisterForm.php index 1d04e11ce..ea544eeff 100644 --- a/src/Pyz/Yves/Customer/Form/RegisterForm.php +++ b/src/Pyz/Yves/Customer/Form/RegisterForm.php @@ -137,11 +137,11 @@ protected function addPasswordField(FormBuilderInterface $builder) 'required' => true, 'first_options' => [ 'label' => 'forms.password', - 'attr' => ['autocomplete' => 'off', ] + 'attr' => ['autocomplete' => 'off'] ], 'second_options' => [ 'label' => 'forms.confirm-password', - 'attr' => ['autocomplete' => 'off', ] + 'attr' => ['autocomplete' => 'off'] ], 'constraints' => [ new NotBlank(), From 3aa869d9cc0f8c044abf60c93f77a8dc24b44b51 Mon Sep 17 00:00:00 2001 From: Vagrant User Date: Tue, 7 Jun 2016 08:00:29 +0000 Subject: [PATCH 05/29] updated composer lock --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 80b365675..7bdf88e80 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "cb220e10a472288581893c22e3407596", - "content-hash": "0718377da637a8cc05c2d795715adc88", + "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", + "content-hash": "acc38c61be29eba8e913c8f9f5103d30", "packages": [ { "name": "container-interop/container-interop", @@ -945,11 +945,11 @@ }, { "name": "spryker/spryker", - "version": "dev-bugfix/2130-LIVE07-Password-field-with-autocomplete", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "b6c990331f6017fb49a443a83c0b84d8d5cc93fb" + "reference": "d7ad70b228add127c62e3bef764944aadaa977f5" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1412,7 +1412,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-06 13:20:36" + "time": "2016-06-06 16:31:43" }, { "name": "symfony-cmf/routing", From c47ce2c9c35cc317eb14f8c32a0b0638bacb9876 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Thu, 2 Jun 2016 09:10:28 +0000 Subject: [PATCH 06/29] 2103 add trusted hosts feature to prevent HTTP Host header poisoning vulnerability --- config/Shared/config_default-development.ci.php | 2 ++ config/Shared/config_default-development_DE.php | 1 + .../Plugin/Provider/ApplicationServiceProvider.php | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/config/Shared/config_default-development.ci.php b/config/Shared/config_default-development.ci.php index ec0a21c6a..be8de8ce4 100644 --- a/config/Shared/config_default-development.ci.php +++ b/config/Shared/config_default-development.ci.php @@ -39,6 +39,8 @@ $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; + /* RabbitMQ */ $config[ApplicationConstants::ZED_RABBITMQ_HOST] = 'localhost'; $config[ApplicationConstants::ZED_RABBITMQ_PORT] = '5672'; diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php index 6c18e337b..a56da5f41 100644 --- a/config/Shared/config_default-development_DE.php +++ b/config/Shared/config_default-development_DE.php @@ -38,6 +38,7 @@ $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; /* RabbitMQ */ $config[ApplicationConstants::ZED_RABBITMQ_HOST] = 'localhost'; diff --git a/src/Pyz/Yves/Application/Plugin/Provider/ApplicationServiceProvider.php b/src/Pyz/Yves/Application/Plugin/Provider/ApplicationServiceProvider.php index 0b2410d13..89285e44a 100644 --- a/src/Pyz/Yves/Application/Plugin/Provider/ApplicationServiceProvider.php +++ b/src/Pyz/Yves/Application/Plugin/Provider/ApplicationServiceProvider.php @@ -44,6 +44,7 @@ public function register(Application $app) $this->setControllerResolver(); $this->setProfilerCacheDirectory(); $this->setTrustedProxies(); + $this->setTrustedHosts(); $this->setLocale(); $this->setLogLevel(); $this->setProtocolCheck(); @@ -114,6 +115,15 @@ protected function setTrustedProxies() Request::setTrustedProxies($proxies); } + /** + * @return void + */ + protected function setTrustedHosts() + { + $trustedHosts = Config::get(ApplicationConstants::YVES_TRUSTED_HOSTS); + Request::setTrustedHosts($trustedHosts); + } + /** * @return void */ From db26e83fe8ef260daed7c602e807dabf9fdf0e59 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Thu, 2 Jun 2016 09:33:47 +0000 Subject: [PATCH 07/29] updated composer.lock --- composer.json | 2 +- composer.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index dd460bcfc..75c123641 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-master", + "spryker/spryker": "dev-bugfix/2103-implement-trusted-hosts-check", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index 7bdf88e80..dd76d1a36 100644 --- a/composer.lock +++ b/composer.lock @@ -945,7 +945,7 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/2103-implement-trusted-hosts-check", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", @@ -1810,12 +1810,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9" + "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", - "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", + "url": "https://api.github.com/repos/symfony/form/zipball/23394a60d49d2aa904dacda6e5eb29d88251f9da", + "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da", "shasum": "" }, "require": { From 812fd2d8b3bdffd45917d6784df0a6743eb29564 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Thu, 2 Jun 2016 14:22:58 +0000 Subject: [PATCH 08/29] 2103 corrected the configuration to skip trusted hosts from integrational tests --- config/Shared/config_default-development.ci.php | 2 -- config/Shared/config_default-development_US.php | 2 ++ config/Shared/config_default.php | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/Shared/config_default-development.ci.php b/config/Shared/config_default-development.ci.php index be8de8ce4..ec0a21c6a 100644 --- a/config/Shared/config_default-development.ci.php +++ b/config/Shared/config_default-development.ci.php @@ -39,8 +39,6 @@ $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; -$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; - /* RabbitMQ */ $config[ApplicationConstants::ZED_RABBITMQ_HOST] = 'localhost'; $config[ApplicationConstants::ZED_RABBITMQ_PORT] = '5672'; diff --git a/config/Shared/config_default-development_US.php b/config/Shared/config_default-development_US.php index cfb7f708c..09d111e92 100644 --- a/config/Shared/config_default-development_US.php +++ b/config/Shared/config_default-development_US.php @@ -18,6 +18,8 @@ = $config[ApplicationConstants::HOST_SSL_ZED_API] = 'https://' . $zedHost; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; + $config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.com.spryker.dev'; $config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.com.spryker.dev'; diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index f8324e4f1..dec2bab9c 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -77,6 +77,8 @@ = $config[ApplicationConstants::HOST_SSL_ZED_API] = 'zed.spryker.dev'; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = []; + $config[ApplicationConstants::LOG_LEVEL] = Monolog\Logger::INFO; $config[ApplicationConstants::TRANSFER_USERNAME] = 'yves'; From 0b605925f39e1e544e8c2e5b9f2350e38a162204 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 08:53:59 +0000 Subject: [PATCH 09/29] Updated composer lock file --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index dd76d1a36..104b3fa54 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", - "content-hash": "acc38c61be29eba8e913c8f9f5103d30", + "hash": "bc66db36bcd93a7db5ea63dc08f81e20", + "content-hash": "499a08de8e40a1eda3cb010596a7d3b3", "packages": [ { "name": "container-interop/container-interop", @@ -5441,12 +5441,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/code-sniffer.git", - "reference": "1e0d5e096dd8f5260db0d86e0ca85962884638d9" + "reference": "bd64bbf65217b2a6994e193445f116adf665fdf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/1e0d5e096dd8f5260db0d86e0ca85962884638d9", - "reference": "1e0d5e096dd8f5260db0d86e0ca85962884638d9", + "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/bd64bbf65217b2a6994e193445f116adf665fdf3", + "reference": "bd64bbf65217b2a6994e193445f116adf665fdf3", "shasum": "" }, "require": { @@ -5475,7 +5475,7 @@ "phpcs", "standards" ], - "time": "2016-06-01 10:11:10" + "time": "2016-06-06 11:37:32" }, { "name": "squizlabs/php_codesniffer", From c7124fcc480df1266f8c7437b945a869cd7a98ce Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 17:22:21 +0000 Subject: [PATCH 10/29] fixed conflicts --- assets/Yves/demoshop/js/ui/checkout.js | 4 + composer.json | 2 +- composer.lock | 223 +++++++++--------- src/Pyz/Yves/Application/YvesBootstrap.php | 6 + .../ApplicationDependencyProvider.php | 11 + src/Pyz/Zed/Auth/AuthConfig.php | 1 + 6 files changed, 137 insertions(+), 110 deletions(-) diff --git a/assets/Yves/demoshop/js/ui/checkout.js b/assets/Yves/demoshop/js/ui/checkout.js index 87f4f935a..a411249a8 100644 --- a/assets/Yves/demoshop/js/ui/checkout.js +++ b/assets/Yves/demoshop/js/ui/checkout.js @@ -108,6 +108,10 @@ module.exports = { } }); + $('form.checkout-form').on('submit', function(event) { + $('button[name="summaryForm[checkout.step.place.order]"]').attr('disabled', 'disabled'); + }) + $('input[name="checkout[id_shipment_method]"]').on('change', function() { $shipmentButton.attr('disabled', $('input[name="checkout[id_shipment_method]"]:checked').length != 1); }); diff --git a/composer.json b/composer.json index 75c123641..e6f505d2f 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-bugfix/2103-implement-trusted-hosts-check", + "spryker/spryker": "dev-bugfix/2027-prevent-order-multiple-submit", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index 104b3fa54..507473f06 100644 --- a/composer.lock +++ b/composer.lock @@ -1344,6 +1344,7 @@ "Spryker\\Zed\\Storage\\": "Bundles/Storage/src", "Unit\\Spryker\\Zed\\Storage\\": "Bundles/Storage/tests", "Functional\\Spryker\\Zed\\Storage\\": "Bundles/Storage/tests", + "Spryker\\Shared\\Symfony\\": "Bundles/Symfony/src", "Spryker\\Shared\\Tax\\": "Bundles/Tax/src", "Unit\\Spryker\\Shared\\Tax\\": "Bundles/Tax/tests", "Functional\\Spryker\\Shared\\Tax\\": "Bundles/Tax/tests", @@ -1473,16 +1474,16 @@ }, { "name": "symfony/config", - "version": "v2.8.4", + "version": "v2.8.6", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "5273f4724dc5288fe7a33cb08077ab9852621f2c" + "reference": "edbbcf33cffa2a85104fc80de8dc052cc51596bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/5273f4724dc5288fe7a33cb08077ab9852621f2c", - "reference": "5273f4724dc5288fe7a33cb08077ab9852621f2c", + "url": "https://api.github.com/repos/symfony/config/zipball/edbbcf33cffa2a85104fc80de8dc052cc51596bb", + "reference": "edbbcf33cffa2a85104fc80de8dc052cc51596bb", "shasum": "" }, "require": { @@ -1522,7 +1523,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2016-03-04 07:54:35" + "time": "2016-04-20 18:52:26" }, { "name": "symfony/console", @@ -1645,16 +1646,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.8.4", + "version": "v2.8.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87" + "reference": "a158f13992a3147d466af7a23b564ac719a4ddd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/47d2d8cade9b1c3987573d2943bb9352536cdb87", - "reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a158f13992a3147d466af7a23b564ac719a4ddd8", + "reference": "a158f13992a3147d466af7a23b564ac719a4ddd8", "shasum": "" }, "require": { @@ -1701,7 +1702,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-03-07 14:04:32" + "time": "2016-05-03 18:59:18" }, { "name": "symfony/filesystem", @@ -2003,7 +2004,7 @@ }, { "name": "symfony/intl", - "version": "v2.8.4", + "version": "v2.8.6", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", @@ -2134,16 +2135,16 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942" + "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/8328069d9f5322f0e7b3c3518485acfdc94c3942", - "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/0f8dc2c45f69f8672379e9210bca4a115cd5146f", + "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f", "shasum": "" }, "require": { @@ -2156,7 +2157,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2188,20 +2189,20 @@ "portable", "shim" ], - "time": "2016-02-26 16:18:12" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php54", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb" + "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/9ba741ca01c77282ecf5796c2c1d667f03454ffb", - "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", + "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", "shasum": "" }, "require": { @@ -2210,7 +2211,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2246,7 +2247,7 @@ "portable", "shim" ], - "time": "2016-01-25 19:13:00" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/process", @@ -2933,27 +2934,27 @@ }, { "name": "zendframework/zend-code", - "version": "2.6.2", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4" + "reference": "95033f061b083e16cdee60530ec260d7d628b887" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c4e8f976a772cfb14b47dabd69b5245a423082b4", - "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", + "reference": "95033f061b083e16cdee60530ec260d7d628b887", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-eventmanager": "^2.6|^3.0" + "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-stdlib": "~2.7" + "phpunit/phpunit": "^4.8.21", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", @@ -2981,7 +2982,7 @@ "code", "zf2" ], - "time": "2016-01-05 05:58:37" + "time": "2016-04-20 17:26:42" }, { "name": "zendframework/zend-config", @@ -3343,16 +3344,16 @@ }, { "name": "zendframework/zend-servicemanager", - "version": "2.7.5", + "version": "2.7.6", "source": { "type": "git", "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "fb5b54db5ead533b38e311f14e9c01a79218bf2b" + "reference": "a6db4d13b9141fccce5dcb553df0295d6ad7d477" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/fb5b54db5ead533b38e311f14e9c01a79218bf2b", - "reference": "fb5b54db5ead533b38e311f14e9c01a79218bf2b", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/a6db4d13b9141fccce5dcb553df0295d6ad7d477", + "reference": "a6db4d13b9141fccce5dcb553df0295d6ad7d477", "shasum": "" }, "require": { @@ -3391,20 +3392,20 @@ "servicemanager", "zf2" ], - "time": "2016-02-02 14:11:46" + "time": "2016-04-27 19:07:40" }, { "name": "zendframework/zend-stdlib", - "version": "2.7.6", + "version": "2.7.7", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "4499760badfada27ee600f5c2cfd47d5263ccf1b" + "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/4499760badfada27ee600f5c2cfd47d5263ccf1b", - "reference": "4499760badfada27ee600f5c2cfd47d5263ccf1b", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f", + "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f", "shasum": "" }, "require": { @@ -3450,7 +3451,7 @@ "stdlib", "zf2" ], - "time": "2016-02-19 16:02:11" + "time": "2016-04-12 21:17:31" }, { "name": "zendframework/zend-uri", @@ -3501,16 +3502,16 @@ }, { "name": "zendframework/zend-validator", - "version": "2.7.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "dbacb36514ebc0ec96b9263730eaaa6f0c502197" + "reference": "f956581bc5fa4cf3f2933fe24e77deded8d1937b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/dbacb36514ebc0ec96b9263730eaaa6f0c502197", - "reference": "dbacb36514ebc0ec96b9263730eaaa6f0c502197", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/f956581bc5fa4cf3f2933fe24e77deded8d1937b", + "reference": "f956581bc5fa4cf3f2933fe24e77deded8d1937b", "shasum": "" }, "require": { @@ -3545,8 +3546,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" }, "zf": { "component": "Zend\\Validator", @@ -3568,22 +3569,22 @@ "validator", "zf2" ], - "time": "2016-04-06 15:44:10" + "time": "2016-05-16 13:39:40" } ], "packages-dev": [ { "name": "codeception/codeception", - "version": "2.1.7", + "version": "2.1.8", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "65971b0dee4972710365b6102154cd412a9bf7b1" + "reference": "f3daa61f0f11c531b33eb3623ab0daa599d88a79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/65971b0dee4972710365b6102154cd412a9bf7b1", - "reference": "65971b0dee4972710365b6102154cd412a9bf7b1", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f3daa61f0f11c531b33eb3623ab0daa599d88a79", + "reference": "f3daa61f0f11c531b33eb3623ab0daa599d88a79", "shasum": "" }, "require": { @@ -3651,7 +3652,7 @@ "functional testing", "unit testing" ], - "time": "2016-03-12 01:15:25" + "time": "2016-04-15 02:56:43" }, { "name": "doctrine/instantiator", @@ -3814,16 +3815,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8", - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579", + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579", "shasum": "" }, "require": { @@ -3861,20 +3862,20 @@ "keywords": [ "promise" ], - "time": "2016-03-08 01:15:46" + "time": "2016-05-18 16:56:05" }, { "name": "guzzlehttp/psr7", - "version": "1.2.3", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b" + "reference": "31382fef2889136415751badebbd1cb022a4ed72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b", - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72", + "reference": "31382fef2889136415751badebbd1cb022a4ed72", "shasum": "" }, "require": { @@ -3919,20 +3920,20 @@ "stream", "uri" ], - "time": "2016-02-18 21:54:00" + "time": "2016-04-13 19:56:01" }, { "name": "myclabs/deep-copy", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc" + "reference": "a8773992b362b58498eed24bf85005f363c34771" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e3abefcd7f106677fd352cd7c187d6c969aa9ddc", - "reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771", + "reference": "a8773992b362b58498eed24bf85005f363c34771", "shasum": "" }, "require": { @@ -3961,7 +3962,7 @@ "object", "object graph" ], - "time": "2015-11-07 22:20:37" + "time": "2015-11-20 12:04:31" }, { "name": "pdepend/pdepend", @@ -4385,21 +4386,24 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4|~5" + }, "type": "library", "autoload": { "classmap": [ @@ -4422,7 +4426,7 @@ "keywords": [ "timer" ], - "time": "2015-06-21 08:01:12" + "time": "2016-05-12 18:03:57" }, { "name": "phpunit/php-token-stream", @@ -4475,16 +4479,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.3.1", + "version": "5.3.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "34a3acb401ae79deb37bc6e5f5ec3d325b369b4c" + "reference": "00dd95ffb48805503817ced06399017df315fe5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34a3acb401ae79deb37bc6e5f5ec3d325b369b4c", - "reference": "34a3acb401ae79deb37bc6e5f5ec3d325b369b4c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00dd95ffb48805503817ced06399017df315fe5c", + "reference": "00dd95ffb48805503817ced06399017df315fe5c", "shasum": "" }, "require": { @@ -4546,20 +4550,20 @@ "testing", "xunit" ], - "time": "2016-04-07 07:04:34" + "time": "2016-05-11 13:28:45" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "7c34c9bdde4131b824086457a3145e27dba10ca1" + "reference": "151c96874bff6fe61a25039df60e776613a61489" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/7c34c9bdde4131b824086457a3145e27dba10ca1", - "reference": "7c34c9bdde4131b824086457a3145e27dba10ca1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/151c96874bff6fe61a25039df60e776613a61489", + "reference": "151c96874bff6fe61a25039df60e776613a61489", "shasum": "" }, "require": { @@ -4602,7 +4606,7 @@ "mock", "xunit" ], - "time": "2016-03-24 05:58:25" + "time": "2016-04-20 14:39:26" }, { "name": "psr/http-message", @@ -4816,16 +4820,16 @@ }, { "name": "sebastian/environment", - "version": "1.3.5", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", "shasum": "" }, "require": { @@ -4862,7 +4866,7 @@ "environment", "hhvm" ], - "time": "2016-02-26 18:40:46" + "time": "2016-05-17 03:18:57" }, { "name": "sebastian/exporter", @@ -5437,7 +5441,7 @@ }, { "name": "spryker/code-sniffer", - "version": "dev-master", + "version": "0.3.1", "source": { "type": "git", "url": "https://github.com/spryker/code-sniffer.git", @@ -5557,7 +5561,7 @@ }, { "name": "symfony/browser-kit", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -5614,7 +5618,7 @@ }, { "name": "symfony/css-selector", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -5667,16 +5671,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "6a9058101b591edced21ca3c83c80a3978f5c6b0" + "reference": "b2f4d40a6ed0f6ace59aa3c88d08a94eb9aef811" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a9058101b591edced21ca3c83c80a3978f5c6b0", - "reference": "6a9058101b591edced21ca3c83c80a3978f5c6b0", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b2f4d40a6ed0f6ace59aa3c88d08a94eb9aef811", + "reference": "b2f4d40a6ed0f6ace59aa3c88d08a94eb9aef811", "shasum": "" }, "require": { @@ -5689,6 +5693,7 @@ }, "suggest": { "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", "symfony/yaml": "" }, @@ -5722,20 +5727,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2016-03-30 10:41:14" + "time": "2016-05-09 18:14:44" }, { "name": "symfony/dom-crawler", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f" + "reference": "49b588841225b205700e5122fa01911cabada857" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f", - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/49b588841225b205700e5122fa01911cabada857", + "reference": "49b588841225b205700e5122fa01911cabada857", "shasum": "" }, "require": { @@ -5778,20 +5783,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-03-23 13:23:25" + "time": "2016-04-12 18:09:53" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" + "reference": "dff51f72b0706335131b00a7f49606168c582594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", "shasum": "" }, "require": { @@ -5803,7 +5808,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -5837,11 +5842,11 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/stopwatch", - "version": "v2.8.4", + "version": "v2.8.6", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", diff --git a/src/Pyz/Yves/Application/YvesBootstrap.php b/src/Pyz/Yves/Application/YvesBootstrap.php index ebe15a26e..83a05a609 100644 --- a/src/Pyz/Yves/Application/YvesBootstrap.php +++ b/src/Pyz/Yves/Application/YvesBootstrap.php @@ -39,6 +39,7 @@ use Spryker\Shared\Application\Communication\Plugin\ServiceProvider\RoutingServiceProvider; use Spryker\Shared\Application\Communication\Plugin\ServiceProvider\UrlGeneratorServiceProvider; use Spryker\Shared\Config\Config; +use Spryker\Shared\Symfony\Plugin\ServiceProvider\DoubleSubmitProtectionServiceProvider; use Spryker\Yves\Application\Application; use Spryker\Yves\Application\Plugin\Provider\CookieServiceProvider; use Spryker\Yves\Application\Plugin\Provider\ExceptionServiceProvider; @@ -100,6 +101,11 @@ protected function registerServiceProviders() $this->application->register(new FlashMessengerServiceProvider()); $this->application->register(new WebProfilerServiceProvider()); $this->application->register(new AutoloaderCacheServiceProvider()); + $this->application->register(new DoubleSubmitProtectionServiceProvider()); + + if (Config::get(ApplicationConstants::ENABLE_WEB_PROFILER, false)) { + $this->application->register(new WebProfilerServiceProvider()); + } } /** diff --git a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php index 5d4154607..7fb37c9c3 100644 --- a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php +++ b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php @@ -13,6 +13,13 @@ use Silex\Provider\ServiceControllerServiceProvider; use Silex\Provider\SessionServiceProvider; use Silex\Provider\TwigServiceProvider; +<<<<<<< HEAD +======= +use Silex\Provider\WebProfilerServiceProvider; +use Spryker\Shared\Application\ApplicationConstants; +use Spryker\Shared\Config\Config; +use Spryker\Shared\Symfony\Plugin\ServiceProvider\DoubleSubmitProtectionServiceProvider; +>>>>>>> a909647... Updated composer.lock use Spryker\Zed\Acl\Communication\Plugin\Bootstrap\AclBootstrapProvider; use Spryker\Zed\Application\ApplicationDependencyProvider as SprykerApplicationDependencyProvider; use Spryker\Zed\Application\Communication\Plugin\ServiceProvider\DateFormatterServiceProvider; @@ -87,7 +94,11 @@ protected function getServiceProvider(Container $container) new DateFormatterServiceProvider(), new TranslationServiceProvider(), new SubRequestServiceProvider(), +<<<<<<< HEAD new WebProfilerServiceProvider() +======= + new DoubleSubmitProtectionServiceProvider() +>>>>>>> a909647... Updated composer.lock ]; return array_merge($providers, $coreProviders); diff --git a/src/Pyz/Zed/Auth/AuthConfig.php b/src/Pyz/Zed/Auth/AuthConfig.php index 42877aa77..2fbec683c 100644 --- a/src/Pyz/Zed/Auth/AuthConfig.php +++ b/src/Pyz/Zed/Auth/AuthConfig.php @@ -18,6 +18,7 @@ class AuthConfig extends SprykerAuthConfig public function getIgnorable() { $this->addIgnorable('system', 'heartbeat', 'index'); + $this->addIgnorable('_profiler', 'wdt', '*'); return parent::getIgnorable(); } From fa5738c7b504fae0c925e45d45357720aa7172ac Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 15:18:12 +0000 Subject: [PATCH 11/29] fixed application conflicts --- .../ApplicationDependencyProvider.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php index 7fb37c9c3..9ce9e3524 100644 --- a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php +++ b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php @@ -7,19 +7,15 @@ namespace Pyz\Zed\Application; -use Pyz\Yves\Application\Plugin\Provider\WebProfilerServiceProvider; use Pyz\Yves\NewRelic\Plugin\Provider\NewRelicServiceProvider; use Silex\Provider\HttpFragmentServiceProvider; use Silex\Provider\ServiceControllerServiceProvider; use Silex\Provider\SessionServiceProvider; use Silex\Provider\TwigServiceProvider; -<<<<<<< HEAD -======= use Silex\Provider\WebProfilerServiceProvider; use Spryker\Shared\Application\ApplicationConstants; use Spryker\Shared\Config\Config; use Spryker\Shared\Symfony\Plugin\ServiceProvider\DoubleSubmitProtectionServiceProvider; ->>>>>>> a909647... Updated composer.lock use Spryker\Zed\Acl\Communication\Plugin\Bootstrap\AclBootstrapProvider; use Spryker\Zed\Application\ApplicationDependencyProvider as SprykerApplicationDependencyProvider; use Spryker\Zed\Application\Communication\Plugin\ServiceProvider\DateFormatterServiceProvider; @@ -94,14 +90,18 @@ protected function getServiceProvider(Container $container) new DateFormatterServiceProvider(), new TranslationServiceProvider(), new SubRequestServiceProvider(), -<<<<<<< HEAD - new WebProfilerServiceProvider() -======= + new WebProfilerServiceProvider(), new DoubleSubmitProtectionServiceProvider() ->>>>>>> a909647... Updated composer.lock ]; - return array_merge($providers, $coreProviders); + if (Config::get(ApplicationConstants::ENABLE_WEB_PROFILER, false)) { + $providers[] = new WebProfilerServiceProvider(); + } + + $providers = array_merge($providers, $coreProviders); + $providers[] = new DoubleSubmitProtectionServiceProvider(); + + return $providers; } /** From 7c85da3a6fbc1014267543cd54222d230c99a274 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 17:23:59 +0000 Subject: [PATCH 12/29] resolved conflicts --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 507473f06..50a648d92 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "bc66db36bcd93a7db5ea63dc08f81e20", - "content-hash": "499a08de8e40a1eda3cb010596a7d3b3", + "hash": "879e967bce23b85efce5ff7e6c47e89d", + "content-hash": "b622807d9f8622e58e645149998f2ca8", "packages": [ { "name": "container-interop/container-interop", From 4fe5c4b5058833ba7d68b8d64603c1a925ce6cc0 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 15:42:15 +0000 Subject: [PATCH 13/29] Fixed conflicts, updated composer.lock --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 50a648d92..ab53e7854 100644 --- a/composer.lock +++ b/composer.lock @@ -949,7 +949,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "d7ad70b228add127c62e3bef764944aadaa977f5" + "reference": "d6d5be5d472323232de925c60372c555a2c88ee7" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1413,7 +1413,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-06 16:31:43" + "time": "2016-06-06 15:27:55" }, { "name": "symfony-cmf/routing", From 982a3715d815cfdf024a596c0ed7052d2ebd8ec6 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 16:54:24 +0000 Subject: [PATCH 14/29] Fixed changes, made by merge/conflicts resolve --- src/Pyz/Zed/Application/ApplicationDependencyProvider.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php index 9ce9e3524..c53f63122 100644 --- a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php +++ b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php @@ -90,8 +90,7 @@ protected function getServiceProvider(Container $container) new DateFormatterServiceProvider(), new TranslationServiceProvider(), new SubRequestServiceProvider(), - new WebProfilerServiceProvider(), - new DoubleSubmitProtectionServiceProvider() + new WebProfilerServiceProvider() ]; if (Config::get(ApplicationConstants::ENABLE_WEB_PROFILER, false)) { From c9fdd7eb82f2da8ea1fb53aad90cae5dea8ab06c Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 17:25:31 +0000 Subject: [PATCH 15/29] updated lock file --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index ab53e7854..d1ac2ed3d 100644 --- a/composer.lock +++ b/composer.lock @@ -945,7 +945,7 @@ }, { "name": "spryker/spryker", - "version": "dev-bugfix/2103-implement-trusted-hosts-check", + "version": "dev-bugfix/2027-prevent-order-multiple-submit", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", From 930e73271782daeb8e96d4ac78b7eccad19130c9 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 09:21:06 +0000 Subject: [PATCH 16/29] Updated .lock file --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index d1ac2ed3d..1f2105e23 100644 --- a/composer.lock +++ b/composer.lock @@ -5445,12 +5445,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/code-sniffer.git", - "reference": "bd64bbf65217b2a6994e193445f116adf665fdf3" + "reference": "940915a9b69fe27ff9a0abfae395576d66dbdb2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/bd64bbf65217b2a6994e193445f116adf665fdf3", - "reference": "bd64bbf65217b2a6994e193445f116adf665fdf3", + "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/940915a9b69fe27ff9a0abfae395576d66dbdb2f", + "reference": "940915a9b69fe27ff9a0abfae395576d66dbdb2f", "shasum": "" }, "require": { @@ -5479,7 +5479,7 @@ "phpcs", "standards" ], - "time": "2016-06-06 11:37:32" + "time": "2016-04-13 14:03:59" }, { "name": "squizlabs/php_codesniffer", From 1bc913fd50d060f2b006676593d850b8f5be3007 Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Tue, 7 Jun 2016 09:29:43 +0000 Subject: [PATCH 17/29] updated composer lock --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index e6f505d2f..dd460bcfc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-bugfix/2027-prevent-order-multiple-submit", + "spryker/spryker": "dev-master", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index 1f2105e23..593224ea8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "879e967bce23b85efce5ff7e6c47e89d", - "content-hash": "b622807d9f8622e58e645149998f2ca8", + "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", + "content-hash": "acc38c61be29eba8e913c8f9f5103d30", "packages": [ { "name": "container-interop/container-interop", @@ -945,11 +945,11 @@ }, { "name": "spryker/spryker", - "version": "dev-bugfix/2027-prevent-order-multiple-submit", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "d6d5be5d472323232de925c60372c555a2c88ee7" + "reference": "8bde36932a2c9458e1eb3521e88635c9064fd645" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1413,7 +1413,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-06 15:27:55" + "time": "2016-06-07 09:08:13" }, { "name": "symfony-cmf/routing", @@ -1811,12 +1811,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da" + "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/23394a60d49d2aa904dacda6e5eb29d88251f9da", - "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da", + "url": "https://api.github.com/repos/symfony/form/zipball/22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", + "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", "shasum": "" }, "require": { From cbc1f39e77ca2349b933c56c2baaee13b8ff2e85 Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Tue, 7 Jun 2016 10:19:39 +0000 Subject: [PATCH 18/29] added new migration for customer bundle and updated composer lock --- composer.lock | 4 +- .../PropelMigration_1465294472.php | 97 +++++++++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 src/Orm/Propel/DE/Migration_pgsql/PropelMigration_1465294472.php diff --git a/composer.lock b/composer.lock index 593224ea8..67a8cb929 100644 --- a/composer.lock +++ b/composer.lock @@ -949,7 +949,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "8bde36932a2c9458e1eb3521e88635c9064fd645" + "reference": "03ce01a39bb058b97f38acf939ba3cbd306241ee" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1413,7 +1413,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-07 09:08:13" + "time": "2016-06-07 09:59:33" }, { "name": "symfony-cmf/routing", diff --git a/src/Orm/Propel/DE/Migration_pgsql/PropelMigration_1465294472.php b/src/Orm/Propel/DE/Migration_pgsql/PropelMigration_1465294472.php new file mode 100644 index 000000000..b275a3bce --- /dev/null +++ b/src/Orm/Propel/DE/Migration_pgsql/PropelMigration_1465294472.php @@ -0,0 +1,97 @@ + ' +ALTER TABLE "spy_customer" DROP CONSTRAINT "spy_customer-default_billing_address"; + +ALTER TABLE "spy_customer" DROP CONSTRAINT "spy_customer-default_shipping_address"; + +ALTER TABLE "spy_customer" ADD CONSTRAINT "spy_customer-default_billing_address" + FOREIGN KEY ("default_billing_address") + REFERENCES "spy_customer_address" ("id_customer_address") + ON DELETE SET NULL; + +ALTER TABLE "spy_customer" ADD CONSTRAINT "spy_customer-default_shipping_address" + FOREIGN KEY ("default_shipping_address") + REFERENCES "spy_customer_address" ("id_customer_address") + ON DELETE SET NULL; + +ALTER TABLE "spy_customer_address" DROP CONSTRAINT "spy_customer_address-fk_customer"; + +ALTER TABLE "spy_customer_address" ADD CONSTRAINT "spy_customer_address-fk_customer" + FOREIGN KEY ("fk_customer") + REFERENCES "spy_customer" ("id_customer") + ON DELETE CASCADE; +', +); + } + + /** + * Get the SQL statements for the Down migration + * + * @return array list of the SQL strings to execute for the Down migration + * the keys being the datasources + */ + public function getDownSQL() + { + return array ( + 'zed' => ' +ALTER TABLE "spy_customer" DROP CONSTRAINT "spy_customer-default_billing_address"; + +ALTER TABLE "spy_customer" DROP CONSTRAINT "spy_customer-default_shipping_address"; + +ALTER TABLE "spy_customer" ADD CONSTRAINT "spy_customer-default_billing_address" + FOREIGN KEY ("default_billing_address") + REFERENCES "spy_customer_address" ("id_customer_address"); + +ALTER TABLE "spy_customer" ADD CONSTRAINT "spy_customer-default_shipping_address" + FOREIGN KEY ("default_shipping_address") + REFERENCES "spy_customer_address" ("id_customer_address"); + +ALTER TABLE "spy_customer_address" DROP CONSTRAINT "spy_customer_address-fk_customer"; + +ALTER TABLE "spy_customer_address" ADD CONSTRAINT "spy_customer_address-fk_customer" + FOREIGN KEY ("fk_customer") + REFERENCES "spy_customer" ("id_customer"); +', +); + } + +} \ No newline at end of file From d553499f8e31a40e2170530f006c7fbd8cff5dd4 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Wed, 1 Jun 2016 15:59:30 +0000 Subject: [PATCH 19/29] 2108 updated sha1 usages to sha256 --- .../Plugin/Provider/EventJournalServiceProvider.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Pyz/Yves/EventJournal/Plugin/Provider/EventJournalServiceProvider.php b/src/Pyz/Yves/EventJournal/Plugin/Provider/EventJournalServiceProvider.php index cfb0ff7d3..2f1d15f29 100644 --- a/src/Pyz/Yves/EventJournal/Plugin/Provider/EventJournalServiceProvider.php +++ b/src/Pyz/Yves/EventJournal/Plugin/Provider/EventJournalServiceProvider.php @@ -24,6 +24,8 @@ class EventJournalServiceProvider extends AbstractServiceProvider { + const COOKIE_HASH_ALGORITHM = 'sha256'; + /** * @var \Spryker\Client\EventJournal\EventJournalClientInterface */ @@ -142,7 +144,7 @@ private function setTrackingCookie(Application $app, $cookieName, $validFor) // An unsafe value might have been set in browser by JS or XSS, it should be replaced with a safe one. if (empty($_COOKIE[$cookieName]) || !$this->isTrackingValueSafe($_COOKIE[$cookieName])) { // uniqid is based on current timestamp, a server ID should be used to prevent 2 servers generating the same ID for 2 simultaneous requests. - $_COOKIE[$cookieName] = sha1(uniqid(System::getHostname(), true)); + $_COOKIE[$cookieName] = hash(static::COOKIE_HASH_ALGORITHM, uniqid(System::getHostname(), true)); } $dt = new \DateTime(); $app['cookies'][] = new Cookie( From 3264e8cf2fa196dc98fa7f6e85719ef338e0a3f9 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 10:18:16 +0000 Subject: [PATCH 20/29] Updated composer lock and json --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index dd460bcfc..c5e5f666b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-master", + "spryker/spryker": "dev-bugfix/2108-more-secure-hash-functions", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index 67a8cb929..5776eb0cb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", - "content-hash": "acc38c61be29eba8e913c8f9f5103d30", + "hash": "fe2cc04e623567ceb03f5a506c7988b6", + "content-hash": "4897c784cd8f26a990abdc9b4a0e2c4b", "packages": [ { "name": "container-interop/container-interop", @@ -945,7 +945,7 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/2108-more-secure-hash-functions", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", @@ -1811,12 +1811,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9" + "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", - "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", + "url": "https://api.github.com/repos/symfony/form/zipball/23394a60d49d2aa904dacda6e5eb29d88251f9da", + "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da", "shasum": "" }, "require": { From 9155485278850642243d36ea6e015a953caeaf0c Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 10:38:28 +0000 Subject: [PATCH 21/29] updated lock file --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 5776eb0cb..ba9395459 100644 --- a/composer.lock +++ b/composer.lock @@ -949,7 +949,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "03ce01a39bb058b97f38acf939ba3cbd306241ee" + "reference": "b0e3f067baba8462d6a59ab8501058bd62b3ce35" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1413,7 +1413,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-07 09:59:33" + "time": "2016-06-07 10:31:53" }, { "name": "symfony-cmf/routing", From f15224b6af99ce941b4614c45eec2682ce42a98e Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Tue, 7 Jun 2016 11:16:04 +0000 Subject: [PATCH 22/29] updated composer lock --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c5e5f666b..dd460bcfc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-bugfix/2108-more-secure-hash-functions", + "spryker/spryker": "dev-master", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index ba9395459..4017d7d1d 100644 --- a/composer.lock +++ b/composer.lock @@ -1811,12 +1811,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da" + "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/23394a60d49d2aa904dacda6e5eb29d88251f9da", - "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da", + "url": "https://api.github.com/repos/symfony/form/zipball/22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", + "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", "shasum": "" }, "require": { From c4a3b9b4e6c52a3e57c87903f900cbbde6035dc5 Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Tue, 7 Jun 2016 11:18:13 +0000 Subject: [PATCH 23/29] updated composer lock --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 4017d7d1d..f5010d862 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "fe2cc04e623567ceb03f5a506c7988b6", - "content-hash": "4897c784cd8f26a990abdc9b4a0e2c4b", + "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", + "content-hash": "acc38c61be29eba8e913c8f9f5103d30", "packages": [ { "name": "container-interop/container-interop", @@ -945,11 +945,11 @@ }, { "name": "spryker/spryker", - "version": "dev-bugfix/2108-more-secure-hash-functions", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "b0e3f067baba8462d6a59ab8501058bd62b3ce35" + "reference": "2f3fccc177b2d8bbdcd3bcad3776f39f30ad03d3" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1413,7 +1413,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-07 10:31:53" + "time": "2016-06-07 11:10:22" }, { "name": "symfony-cmf/routing", From 6cbe980cae538d3c5d12adf5e8221b9b4302189a Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 12:32:43 +0000 Subject: [PATCH 24/29] Removed DoubleSubmitProtectionServiceProvider from Zed forms --- src/Pyz/Yves/Application/YvesBootstrap.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Pyz/Yves/Application/YvesBootstrap.php b/src/Pyz/Yves/Application/YvesBootstrap.php index 83a05a609..fd60430fa 100644 --- a/src/Pyz/Yves/Application/YvesBootstrap.php +++ b/src/Pyz/Yves/Application/YvesBootstrap.php @@ -39,7 +39,6 @@ use Spryker\Shared\Application\Communication\Plugin\ServiceProvider\RoutingServiceProvider; use Spryker\Shared\Application\Communication\Plugin\ServiceProvider\UrlGeneratorServiceProvider; use Spryker\Shared\Config\Config; -use Spryker\Shared\Symfony\Plugin\ServiceProvider\DoubleSubmitProtectionServiceProvider; use Spryker\Yves\Application\Application; use Spryker\Yves\Application\Plugin\Provider\CookieServiceProvider; use Spryker\Yves\Application\Plugin\Provider\ExceptionServiceProvider; @@ -101,7 +100,6 @@ protected function registerServiceProviders() $this->application->register(new FlashMessengerServiceProvider()); $this->application->register(new WebProfilerServiceProvider()); $this->application->register(new AutoloaderCacheServiceProvider()); - $this->application->register(new DoubleSubmitProtectionServiceProvider()); if (Config::get(ApplicationConstants::ENABLE_WEB_PROFILER, false)) { $this->application->register(new WebProfilerServiceProvider()); From a73c73e5ba5c5b4e84499bde56f78eb59631f60b Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Mon, 6 Jun 2016 17:18:05 +0000 Subject: [PATCH 25/29] resolved conflicts --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index dd460bcfc..72d3fa80b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-master", + "spryker/spryker": "dev-bugfix/1931-AbstractTouchUpdater-and-reserved-keywords-in-mysql", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index f5010d862..044c31c34 100644 --- a/composer.lock +++ b/composer.lock @@ -1811,12 +1811,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9" + "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", - "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", + "url": "https://api.github.com/repos/symfony/form/zipball/23394a60d49d2aa904dacda6e5eb29d88251f9da", + "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da", "shasum": "" }, "require": { From ed320d78cb50dbd9353f343d98268470a4498975 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 13:35:12 +0000 Subject: [PATCH 26/29] updated lock file --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 044c31c34..5d1fc0995 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", - "content-hash": "acc38c61be29eba8e913c8f9f5103d30", + "hash": "729b7a471978dc9ca7d8ad056f9c3f07", + "content-hash": "e207d88bcb33eb35eb36032137ae6904", "packages": [ { "name": "container-interop/container-interop", @@ -945,11 +945,11 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/1931-AbstractTouchUpdater-and-reserved-keywords-in-mysql", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "2f3fccc177b2d8bbdcd3bcad3776f39f30ad03d3" + "reference": "c9272f66cc769a84ae45bda0c5497133bc3723e8" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1344,7 +1344,6 @@ "Spryker\\Zed\\Storage\\": "Bundles/Storage/src", "Unit\\Spryker\\Zed\\Storage\\": "Bundles/Storage/tests", "Functional\\Spryker\\Zed\\Storage\\": "Bundles/Storage/tests", - "Spryker\\Shared\\Symfony\\": "Bundles/Symfony/src", "Spryker\\Shared\\Tax\\": "Bundles/Tax/src", "Unit\\Spryker\\Shared\\Tax\\": "Bundles/Tax/tests", "Functional\\Spryker\\Shared\\Tax\\": "Bundles/Tax/tests", @@ -1413,7 +1412,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-07 11:10:22" + "time": "2016-06-06 17:06:42" }, { "name": "symfony-cmf/routing", From 06e4e2b8b1785d54a455367e61cd0477f35218f9 Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 13:41:08 +0000 Subject: [PATCH 27/29] Undo some extra changes --- src/Pyz/Zed/Application/ApplicationDependencyProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php index c53f63122..f4bc76cdc 100644 --- a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php +++ b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php @@ -98,7 +98,6 @@ protected function getServiceProvider(Container $container) } $providers = array_merge($providers, $coreProviders); - $providers[] = new DoubleSubmitProtectionServiceProvider(); return $providers; } From ebf9f2730c7a2b42b7e37d5bada84d09e3266f9f Mon Sep 17 00:00:00 2001 From: Andriy Netseplyayev Date: Tue, 7 Jun 2016 13:43:13 +0000 Subject: [PATCH 28/29] Undo some extra changes --- src/Pyz/Zed/Application/ApplicationDependencyProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php index f4bc76cdc..3f665b239 100644 --- a/src/Pyz/Zed/Application/ApplicationDependencyProvider.php +++ b/src/Pyz/Zed/Application/ApplicationDependencyProvider.php @@ -15,7 +15,6 @@ use Silex\Provider\WebProfilerServiceProvider; use Spryker\Shared\Application\ApplicationConstants; use Spryker\Shared\Config\Config; -use Spryker\Shared\Symfony\Plugin\ServiceProvider\DoubleSubmitProtectionServiceProvider; use Spryker\Zed\Acl\Communication\Plugin\Bootstrap\AclBootstrapProvider; use Spryker\Zed\Application\ApplicationDependencyProvider as SprykerApplicationDependencyProvider; use Spryker\Zed\Application\Communication\Plugin\ServiceProvider\DateFormatterServiceProvider; From 3871861c598b8e9b78f92cea497b91ae394f4644 Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Tue, 7 Jun 2016 13:53:45 +0000 Subject: [PATCH 29/29] updated composer lock --- composer.json | 2 +- composer.lock | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 72d3fa80b..dd460bcfc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "spryker/spryker": "dev-bugfix/1931-AbstractTouchUpdater-and-reserved-keywords-in-mysql", + "spryker/spryker": "dev-master", "psr/log": "~1.0.0", "propel/propel": "~2.0@dev", diff --git a/composer.lock b/composer.lock index 5d1fc0995..888b5376b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "729b7a471978dc9ca7d8ad056f9c3f07", - "content-hash": "e207d88bcb33eb35eb36032137ae6904", + "hash": "3c9134ac1eb874c0e8e9f4d2f2f87c0d", + "content-hash": "acc38c61be29eba8e913c8f9f5103d30", "packages": [ { "name": "container-interop/container-interop", @@ -945,11 +945,11 @@ }, { "name": "spryker/spryker", - "version": "dev-bugfix/1931-AbstractTouchUpdater-and-reserved-keywords-in-mysql", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "c9272f66cc769a84ae45bda0c5497133bc3723e8" + "reference": "3f2c3180e30058ef588d99c2dfbf5db913c8b350" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1344,6 +1344,7 @@ "Spryker\\Zed\\Storage\\": "Bundles/Storage/src", "Unit\\Spryker\\Zed\\Storage\\": "Bundles/Storage/tests", "Functional\\Spryker\\Zed\\Storage\\": "Bundles/Storage/tests", + "Spryker\\Shared\\Symfony\\": "Bundles/Symfony/src", "Spryker\\Shared\\Tax\\": "Bundles/Tax/src", "Unit\\Spryker\\Shared\\Tax\\": "Bundles/Tax/tests", "Functional\\Spryker\\Shared\\Tax\\": "Bundles/Tax/tests", @@ -1412,7 +1413,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-06-06 17:06:42" + "time": "2016-06-07 13:38:59" }, { "name": "symfony-cmf/routing", @@ -1810,12 +1811,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da" + "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/23394a60d49d2aa904dacda6e5eb29d88251f9da", - "reference": "23394a60d49d2aa904dacda6e5eb29d88251f9da", + "url": "https://api.github.com/repos/symfony/form/zipball/22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", + "reference": "22c55c1bdfb677a3d0678b9ffbfaabcf085a85f9", "shasum": "" }, "require": {