Merge pull request #120 from magento-engcom/MAGETWO-89443

MAGETWO-89443: Release New Version of ZF1
magento · Apr 6, 2018 · d1f17f8 · d1f17f8
2 parents c6b0575 + 459d0d0
commit d1f17f8
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 47 deletions.
diff --git a/composer.json b/composer.json
@@ -11,12 +11,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "repositories": {
-        "zf1": {
-            "type": "vcs",
-            "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git"
-        }
-    },
     "require": {
         "php": "~7.1.3||~7.2.0",
         "ext-ctype": "*",
@@ -44,7 +38,7 @@
         "elasticsearch/elasticsearch": "~2.0|~5.1",
         "magento/composer": "~1.3.0",
         "magento/magento-composer-installer": ">=0.1.11",
-        "magento/zendframework1": "dev-master",
+        "magento/zendframework1": "~1.14.0",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "^2.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php
@@ -80,17 +80,17 @@ public function testIntrospectionQuery()
         $this->assertEquals('Query', $output['queryType']['name']);
         $this->assertEquals($output['types'][0]['kind'], 'OBJECT');
         $expectedFragment =
-        [
-        'name' => 'Query',
-        'description' => 'Description at type level',
-        'kind' => 'OBJECT',
-        'fields' => [
-          [
-           'name' => 'a',
-          'args' => []
-          ]
-        ]
-         ];
+            [
+                'name' => 'Query',
+                'description' => 'Description at type level',
+                'kind' => 'OBJECT',
+                'fields' => [
+                    [
+                        'name' => 'a',
+                        'args' => []
+                    ]
+                ]
+            ];
         $this->assertContains($expectedFragment, $output['types']);
     }
 
@@ -102,27 +102,26 @@ public function testIntrospectsInputObjectWithNonNullInputField()
     {
         $testInputObject = new InputObjectType(
             [
-               'name' => 'ProductFilterInput',
-               'fields' => [
-                   'attributeA' => [
-                       'type' => \GraphQL\Type\Definition\Type::nonNull(
-                           \GraphQL\Type\Definition\Type::string()
-                       ),
-                       'description' => 'testDescriptionForA'
-                   ],
-                   'attributeB' => [
-                       'type' => \GraphQL\Type\Definition\Type::listOf(
-                           \GraphQL\Type\Definition\Type::string()
-                       )
-                   ],
-                   'attributeC' => ['type' => \GraphQL\Type\Definition\Type::string(), 'defaultValue' => null],
-                   'attributeD' => [
-                       'type' => \GraphQL\Type\Definition\Type::string(),
-                       'defaultValue' => 'test',
-                       'description' => 'testDescriptionForD'
-                   ],
-
-               ]
+                'name' => 'ProductFilterInput',
+                'fields' => [
+                    'attributeA' => [
+                        'type' => \GraphQL\Type\Definition\Type::nonNull(
+                            \GraphQL\Type\Definition\Type::string()
+                        ),
+                        'description' => 'testDescriptionForA'
+                    ],
+                    'attributeB' => [
+                        'type' => \GraphQL\Type\Definition\Type::listOf(
+                            \GraphQL\Type\Definition\Type::string()
+                        )
+                    ],
+                    'attributeC' => ['type' => \GraphQL\Type\Definition\Type::string(), 'defaultValue' => null],
+                    'attributeD' => [
+                        'type' => \GraphQL\Type\Definition\Type::string(),
+                        'defaultValue' => 'test',
+                        'description' => 'testDescriptionForD'
+                    ],
+                ]
             ]
         );
         $TestType = new ObjectType([

diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
@@ -30,7 +30,7 @@
         "lib-libxml": "*",
         "colinmollenhour/php-redis-session-abstract": "~1.3.8",
         "composer/composer": "^1.6",
-        "magento/zendframework1": "dev-master",
+        "magento/zendframework1": "~1.14.0",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "symfony/console": "~4.0.0",