Merge pull request #70 from magento-commerce/update-guzzlehttp

bbatsche · web-flow · commit c6be6c898f4c · 2021-09-30T16:32:33.000-05:00
[Imported] The guzzlehttp/guzzle composer dependency has been updated to "^7.3"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4']
     steps:
       - name: Checkout
         uses: actions/checkout@v1
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "composer/composer": "^1.4 || ^2.0",
     "composer/semver": "@stable",
     "graylog2/gelf-php": "^1.4.2",
-    "guzzlehttp/guzzle": "^6.2",
+    "guzzlehttp/guzzle": "^6.3||^7.3",
     "illuminate/config": "^5.5",
     "magento/magento-cloud-components": "^1.0.8",
     "magento/magento-cloud-docker": "^1.0.0",
diff --git a/src/Test/Functional/Acceptance/Acceptance72Ce22Cest.php b/src/Test/Functional/Acceptance/Acceptance72Ce22Cest.php
@@ -14,13 +14,13 @@
 /**
  * @inheritDoc
  *
- * @group php71
+ * @group php72
  * @group edition-ce
  */
-class AcceptanceCe71Cest extends AcceptanceCeCest
+class Acceptance72Ce22Cest extends AcceptanceCeCest
 {
     /**
      * @var string
      */
-    protected $magentoCloudTemplate = '2.2.9';
+    protected $magentoCloudTemplate = '2.2.10';
 }
diff --git a/src/Test/Functional/Acceptance/AdminCredential21Cest.php b/src/Test/Functional/Acceptance/AdminCredential21Cest.php
diff --git a/src/Test/Functional/Acceptance/AdminCredential22Cest.php b/src/Test/Functional/Acceptance/AdminCredential22Cest.php
@@ -8,12 +8,12 @@
 namespace Magento\MagentoCloud\Test\Functional\Acceptance;
 
 /**
- * @group php71
+ * @group php72
  */
 class AdminCredential22Cest extends AdminCredentialCest
 {
     /**
      * @var string
      */
-    protected $magentoCloudTemplate = '2.2.9';
+    protected $magentoCloudTemplate = '2.2.10';
 }
diff --git a/src/Test/Functional/Acceptance/Cron21Cest.php b/src/Test/Functional/Acceptance/Cron21Cest.php
diff --git a/src/Test/Functional/Acceptance/Cron22Cest.php b/src/Test/Functional/Acceptance/Cron22Cest.php
@@ -8,7 +8,7 @@
 namespace Magento\MagentoCloud\Test\Functional\Acceptance;
 
 /**
- * @group php71
+ * @group php72
  */
 class Cron22Cest extends CronCest
 {
@@ -19,7 +19,7 @@ protected function cronDataProvider(): array
     {
         return [
             [
-                'version' => '2.2.0',
+                'version' => '2.2.10',
                 'variables' => [
                     'MAGENTO_CLOUD_VARIABLES' => [
                         'ADMIN_EMAIL' => 'admin@example.com',
@@ -28,32 +28,14 @@ protected function cronDataProvider(): array
                 ],
             ],
             [
-                'version' => '2.2.4',
+                'version' => '2.2.11',
                 'variables' => [
                     'MAGENTO_CLOUD_VARIABLES' => [
                         'ADMIN_EMAIL' => 'admin@example.com',
                         'ADMIN_LOCALE' => 'ar_KW'
                     ],
                 ],
-            ],
-            [
-                'version' => '2.2.5',
-                'variables' => [
-                    'MAGENTO_CLOUD_VARIABLES' => [
-                        'ADMIN_EMAIL' => 'admin@example.com',
-                        'ADMIN_LOCALE' => 'ar_KW'
-                    ],
-                ],
-            ],
-            [
-                'version' => '2.2.8',
-                'variables' => [
-                    'MAGENTO_CLOUD_VARIABLES' => [
-                        'ADMIN_EMAIL' => 'admin@example.com',
-                        'ADMIN_LOCALE' => 'fr_FR'
-                    ],
-                ],
-            ],
+            ]
         ];
     }
 }
diff --git a/src/Test/Functional/Acceptance/ElasticSearch22Cest.php b/src/Test/Functional/Acceptance/ElasticSearch22Cest.php
@@ -8,7 +8,7 @@
 namespace Magento\MagentoCloud\Test\Functional\Acceptance;
 
 /**
- * @group php71
+ * @group php72
  */
 class ElasticSearch22Cest extends ElasticSearchCest
 {
@@ -19,12 +19,12 @@ protected function elasticDataProvider(): array
     {
         return [
             [
-                'magento' => '2.2.8',
+                'magento' => '2.2.10',
                 'removeES' => true,
                 'expectedResult' => ['engine' => 'mysql'],
             ],
             [
-                'magento' => '2.2.8',
+                'magento' => '2.2.10',
                 'removeES' => false,
                 'expectedResult' => [
                     'engine' => 'elasticsearch6',
diff --git a/src/Test/Functional/Acceptance/RedisPhp72M22Cest.php b/src/Test/Functional/Acceptance/RedisPhp72M22Cest.php
@@ -8,9 +8,9 @@
 namespace Magento\MagentoCloud\Test\Functional\Acceptance;
 
 /**
- * @group php71
+ * @group php72
  */
-class RedisPhp71Cest extends RedisCest
+class RedisPhp72M22Cest extends RedisCest
 {
     /**
      * @return array
@@ -19,7 +19,7 @@ protected function defaultConfigurationDataProvider(): array
     {
         return [
             [
-                'version' => '2.2.9',
+                'version' => '2.2.10',
             ],
         ];
     }
@@ -31,7 +31,7 @@ protected function wrongConfigurationDataProvider(): array
     {
         return [
             [
-                'version' => '2.2.9',
+                'version' => '2.2.10',
                 'wrongConfiguration' => [
                     'stage' => [
                         'deploy' => [
@@ -46,7 +46,7 @@ protected function wrongConfigurationDataProvider(): array
                     . '\'\Magento\Framework\Cache\Backend\Redis\'',
             ],
             [
-                'version' => '2.2.9',
+                'version' => '2.2.10',
                 'wrongConfiguration' => [
                     'stage' => [
                         'deploy' => [
@@ -71,7 +71,7 @@ protected function goodConfigurationDataProvider(): array
     {
         return [
             [
-                'version' => '2.2.9',
+                'version' => '2.2.10',
                 'backendModel' => [
                     'stage' => [
                         'deploy' => [
diff --git a/src/Test/Functional/Acceptance/Upgrade21Cest.php b/src/Test/Functional/Acceptance/Upgrade21Cest.php
diff --git a/src/Test/Functional/Acceptance/Upgrade22Cest.php b/src/Test/Functional/Acceptance/Upgrade22Cest.php
@@ -8,17 +8,60 @@
 namespace Magento\MagentoCloud\Test\Functional\Acceptance;
 
 /**
- * @group php71
+ * @group php72
  */
-class Upgrade22Cest extends Upgrade21Cest
+class Upgrade22Cest extends AbstractCest
 {
+    /**
+     * @param \CliTester $I
+     */
+    public function _before(\CliTester $I): void
+    {
+        // Do nothing...
+    }
+
+    /**
+     * @param \CliTester $I
+     * @param \Codeception\Example $data
+     * @throws \Robo\Exception\TaskException
+     * @dataProvider testProvider
+     */
+    public function test(\CliTester $I, \Codeception\Example $data): void
+    {
+        $this->prepareWorkplace($I, $data['from']);
+        $I->generateDockerCompose('--mode=production');
+        $this->assert($I);
+        $I->assertTrue($I->cleanDirectories(['/vendor/*', '/setup/*']));
+        $I->stopEnvironment(true);
+        $I->addDependencyToComposer('magento/magento-cloud-metapackage', $data['to']);
+        $I->composerUpdate();
+        $this->assert($I);
+    }
+
+    /**
+     * @param \CliTester $I
+     * @throws \Robo\Exception\TaskException
+     */
+    protected function assert(\CliTester $I): void
+    {
+
+        $I->runDockerComposeCommand('run build cloud-build');
+        $I->startEnvironment();
+        $I->runDockerComposeCommand('run deploy cloud-deploy');
+        $I->runDockerComposeCommand('run deploy cloud-post-deploy');
+
+        $I->amOnPage('/');
+        $I->see('Home page');
+        $I->see('CMS homepage content goes here.');
+    }
+
     /**
      * @return array
      */
     protected function testProvider(): array
     {
         return [
-            ['from' => '2.2.0', 'to' => '2.2.*']
+            ['from' => '2.2.10', 'to' => '2.2.*']
         ];
     }
 }
diff --git a/src/Test/Functional/Acceptance/Upgrade23Cest.php b/src/Test/Functional/Acceptance/Upgrade23Cest.php
@@ -10,7 +10,7 @@
 /**
  * @group php72
  */
-class Upgrade23Cest extends Upgrade21Cest
+class Upgrade23Cest extends Upgrade22Cest
 {
     /**
      * @return array
diff --git a/src/Test/Functional/Acceptance/UpgradeCest.php b/src/Test/Functional/Acceptance/UpgradeCest.php
@@ -12,7 +12,7 @@
  *
  * @group php73
  */
-class UpgradeCest extends Upgrade21Cest
+class UpgradeCest extends Upgrade22Cest
 {
     /**
      * @var boolean
diff --git a/src/Test/Unit/Http/TransferStatsHandlerTest.php b/src/Test/Unit/Http/TransferStatsHandlerTest.php
diff --git a/tests/functional/_data/modules/Magento/CronTest/composer.json b/tests/functional/_data/modules/Magento/CronTest/composer.json

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@`
`14`	`14`	`/**`
`15`	`15`	`* @inheritDoc`
`16`	`16`	`*`
`17`		`- * @group php71`
	`17`	`+ * @group php72`
`18`	`18`	`* @group edition-ce`
`19`	`19`	`*/`
`20`		`-class AcceptanceCe71Cest extends AcceptanceCeCest`
	`20`	`+class Acceptance72Ce22Cest extends AcceptanceCeCest`
`21`	`21`	`{`
`22`	`22`	`/**`
`23`	`23`	`* @var string`
`24`	`24`	`*/`
`25`		`- protected $magentoCloudTemplate = '2.2.9';`
	`25`	`+ protected $magentoCloudTemplate = '2.2.10';`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@`
`8`	`8`	`namespace Magento\MagentoCloud\Test\Functional\Acceptance;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @group php71`
	`11`	`+ * @group php72`
`12`	`12`	`*/`
`13`	`13`	`class AdminCredential22Cest extends AdminCredentialCest`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* @var string`
`17`	`17`	`*/`
`18`		`- protected $magentoCloudTemplate = '2.2.9';`
	`18`	`+ protected $magentoCloudTemplate = '2.2.10';`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace Magento\MagentoCloud\Test\Functional\Acceptance;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @group php71`
	`11`	`+ * @group php72`
`12`	`12`	`*/`
`13`	`13`	`class ElasticSearch22Cest extends ElasticSearchCest`
`14`	`14`	`{`
`@@ -19,12 +19,12 @@ protected function elasticDataProvider(): array`
`19`	`19`	`{`
`20`	`20`	`return [`
`21`	`21`	`[`
`22`		`- 'magento' => '2.2.8',`
	`22`	`+ 'magento' => '2.2.10',`
`23`	`23`	`'removeES' => true,`
`24`	`24`	`'expectedResult' => ['engine' => 'mysql'],`
`25`	`25`	`],`
`26`	`26`	`[`
`27`		`- 'magento' => '2.2.8',`
	`27`	`+ 'magento' => '2.2.10',`
`28`	`28`	`'removeES' => false,`
`29`	`29`	`'expectedResult' => [`
`30`	`30`	`'engine' => 'elasticsearch6',`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`namespace Magento\MagentoCloud\Test\Functional\Acceptance;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @group php71`
	`11`	`+ * @group php72`
`12`	`12`	`*/`
`13`		`-class RedisPhp71Cest extends RedisCest`
	`13`	`+class RedisPhp72M22Cest extends RedisCest`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* @return array`
`@@ -19,7 +19,7 @@ protected function defaultConfigurationDataProvider(): array`
`19`	`19`	`{`
`20`	`20`	`return [`
`21`	`21`	`[`
`22`		`- 'version' => '2.2.9',`
	`22`	`+ 'version' => '2.2.10',`
`23`	`23`	`],`
`24`	`24`	`];`
`25`	`25`	`}`
`@@ -31,7 +31,7 @@ protected function wrongConfigurationDataProvider(): array`
`31`	`31`	`{`
`32`	`32`	`return [`
`33`	`33`	`[`
`34`		`- 'version' => '2.2.9',`
	`34`	`+ 'version' => '2.2.10',`
`35`	`35`	`'wrongConfiguration' => [`
`36`	`36`	`'stage' => [`
`37`	`37`	`'deploy' => [`
`@@ -46,7 +46,7 @@ protected function wrongConfigurationDataProvider(): array`
`46`	`46`	`. '\'\Magento\Framework\Cache\Backend\Redis\'',`
`47`	`47`	`],`
`48`	`48`	`[`
`49`		`- 'version' => '2.2.9',`
	`49`	`+ 'version' => '2.2.10',`
`50`	`50`	`'wrongConfiguration' => [`
`51`	`51`	`'stage' => [`
`52`	`52`	`'deploy' => [`
`@@ -71,7 +71,7 @@ protected function goodConfigurationDataProvider(): array`
`71`	`71`	`{`
`72`	`72`	`return [`
`73`	`73`	`[`
`74`		`- 'version' => '2.2.9',`
	`74`	`+ 'version' => '2.2.10',`
`75`	`75`	`'backendModel' => [`
`76`	`76`	`'stage' => [`
`77`	`77`	`'deploy' => [`