From 459d0d0474d40057db610bbb07f230d7b5892d94 Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 6 Apr 2018 13:31:40 -0500 Subject: [PATCH] MAGETWO-89443: Release New Version of ZF1 - update magento/zendframework1 to released version --- composer.json | 8 +-- composer.lock | 13 ++-- .../GraphQl/GraphQlIntrospectionTest.php | 63 +++++++++---------- lib/internal/Magento/Framework/composer.json | 2 +- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index b9c27d305fb61..2c1cd6ca7bd96 100644 --- 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 index 072f4af786daa..8c0f41e1b9e91 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a7b90e7be9e8ea27efb8230cffb65322", + "content-hash": "cecf96ace5eaae67adee0940bba7bf93", "packages": [ { "name": "braintree/braintree_php", @@ -825,16 +825,16 @@ }, { "name": "magento/zendframework1", - "version": "dev-master", + "version": "1.14.0", "source": { "type": "git", - "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git", - "reference": "7036c9e7784c7fd8cbe0d5df3a1bbc8161dbe774" + "url": "https://github.com/magento/zf1.git", + "reference": "68522e5768edc8e829d1f64b620a3de3753f1141" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/7036c9e7784c7fd8cbe0d5df3a1bbc8161dbe774", - "reference": "7036c9e7784c7fd8cbe0d5df3a1bbc8161dbe774", + "url": "https://api.github.com/repos/magento/zf1/zipball/68522e5768edc8e829d1f64b620a3de3753f1141", + "reference": "68522e5768edc8e829d1f64b620a3de3753f1141", "shasum": "" }, "archive": { @@ -6583,7 +6583,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "magento/zendframework1": 20, "phpmd/phpmd": 0 }, "prefer-stable": true, diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php index 713c2d3e5af0f..9d98f945a936e 100644 --- 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 index 9305a6630e19b..ce6a5d2df9c6c 100644 --- 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",