From 2d92c3043b797ad8b17e98f2a3c45b3b61a2a472 Mon Sep 17 00:00:00 2001 From: Greg Anderson Date: Thu, 7 Sep 2017 15:24:33 -0700 Subject: [PATCH 1/2] Require PHP 7.0 during dependency resolution, even if running 7.1+ --- composer.json | 5 +- composer.lock | 190 ++++++++++++++++++++++++++------------------------ 2 files changed, 101 insertions(+), 94 deletions(-) diff --git a/composer.json b/composer.json index 3a8b5fdc..82120555 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,10 @@ "vendor-dir": "vendor", "preferred-install": "dist", "optimize-autoloader": true, - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "7.0" + } }, "extra": { "wordpress-install-dir": "web/wp", diff --git a/composer.lock b/composer.lock index 5b63ece1..3cf48bcb 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": "17a00b8294cb4bb3c5623dabbdb6060f", + "content-hash": "d05cd60d1fcedf13db558b202c48fbff", "packages": [ { "name": "composer/installers", @@ -537,16 +537,16 @@ }, { "name": "behat/gherkin", - "version": "v4.4.5", + "version": "v4.5.1", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74" + "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", + "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", "shasum": "" }, "require": { @@ -592,7 +592,7 @@ "gherkin", "parser" ], - "time": "2016-10-30T11:50:56+00:00" + "time": "2017-08-30T11:04:43+00:00" }, { "name": "behat/mink", @@ -1021,32 +1021,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.1.0", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "squizlabs/php_codesniffer": "^3.0.2" + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -1071,7 +1071,7 @@ "constructor", "instantiate" ], - "time": "2017-07-22T11:58:36+00:00" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "fabpot/goutte", @@ -1516,16 +1516,16 @@ }, { "name": "ocramius/package-versions", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "51e867c70f0799790b3e82276875414ce13daaca" + "reference": "72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/51e867c70f0799790b3e82276875414ce13daaca", - "reference": "51e867c70f0799790b3e82276875414ce13daaca", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7", + "reference": "72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7", "shasum": "" }, "require": { @@ -1535,7 +1535,8 @@ "require-dev": { "composer/composer": "^1.3", "ext-zip": "*", - "phpunit/phpunit": "^5.4.7" + "humbug/humbug": "dev-master", + "phpunit/phpunit": "^5.7.5" }, "type": "composer-plugin", "extra": { @@ -1560,37 +1561,33 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2016-12-30T09:49:15+00:00" + "time": "2017-09-06T15:24:43+00:00" }, { "name": "ocramius/proxy-manager", - "version": "2.1.1", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "e18ac876b2e4819c76349de8f78ccc8ef1554cd7" + "reference": "a55d08229f4f614bf335759ed0cf63378feeb2e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/e18ac876b2e4819c76349de8f78ccc8ef1554cd7", - "reference": "e18ac876b2e4819c76349de8f78ccc8ef1554cd7", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/a55d08229f4f614bf335759ed0cf63378feeb2e6", + "reference": "a55d08229f4f614bf335759ed0cf63378feeb2e6", "shasum": "" }, "require": { - "ocramius/package-versions": "^1.1.1", - "php": "^7.1.0", - "zendframework/zend-code": "^3.1.0" + "ocramius/package-versions": "^1.0", + "php": "7.0.0 - 7.0.5 || ^7.0.7", + "zendframework/zend-code": "3.0.0 - 3.0.2 || ^3.0.4" }, "require-dev": { - "couscous/couscous": "^1.5.2", + "couscous/couscous": "^1.4.0", "ext-phar": "*", - "humbug/humbug": "dev-master@DEV", - "nikic/php-parser": "^3.0.4", - "phpbench/phpbench": "^0.12.2", - "phpstan/phpstan": "^0.6.4", - "phpunit/phpunit": "^5.6.4", - "phpunit/phpunit-mock-objects": "^3.4.1", - "squizlabs/php_codesniffer": "^2.7.0" + "phpbench/phpbench": "^0.11.2", + "phpunit/phpunit": "^5.4.6", + "squizlabs/php_codesniffer": "^2.6.0" }, "suggest": { "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", @@ -1629,7 +1626,7 @@ "proxy pattern", "service proxies" ], - "time": "2017-05-04T11:12:50+00:00" + "time": "2016-11-04T15:53:15+00:00" }, { "name": "pantheon-systems/quicksilver-pushback", @@ -1662,25 +1659,28 @@ "source": { "type": "git", "url": "https://github.com/paulgibbs/behat-wordpress-extension.git", - "reference": "e9e22cb2935927005217bab576214f858221d3e3" + "reference": "beba3affcebc0b35543db0b744d36d65513872ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paulgibbs/behat-wordpress-extension/zipball/e9e22cb2935927005217bab576214f858221d3e3", - "reference": "e9e22cb2935927005217bab576214f858221d3e3", + "url": "https://api.github.com/repos/paulgibbs/behat-wordpress-extension/zipball/beba3affcebc0b35543db0b744d36d65513872ca", + "reference": "beba3affcebc0b35543db0b744d36d65513872ca", "shasum": "" }, "require": { "behat/behat": "~3.1", "behat/mink-goutte-driver": "~1.2", "behat/mink-selenium2-driver": "~1.3", - "php": ">=5.6.0", + "ocramius/proxy-manager": "2.0.4", + "php": "~7.0", "roave/security-advisories": "dev-master", - "sensiolabs/behat-page-object-extension": "~2.1" + "sensiolabs/behat-page-object-extension": "~2.1", + "zendframework/zend-code": "3.1.0" }, "require-dev": { + "joomla-projects/selenium-server-standalone": "~3.5", "squizlabs/php_codesniffer": "~3.0", - "wp-cli/wp-cli": "~1.0" + "wp-cli/wp-cli": "~1.3" }, "suggest": { "behat/mink-selenium2-driver": "JS-enabled Mink driver (requires Selenium2)" @@ -1714,7 +1714,7 @@ "extension", "wordpress" ], - "time": "2017-07-20T15:08:46+00:00" + "time": "2017-09-06T14:03:15+00:00" }, { "name": "phar-io/manifest", @@ -1874,22 +1874,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" + "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", + "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -1915,20 +1915,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08T06:39:58+00:00" + "time": "2017-08-30T18:51:59+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.3.0", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { @@ -1962,26 +1962,26 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03T08:32:36+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -1992,7 +1992,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -2025,7 +2025,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-09-04T11:05:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2230,16 +2230,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b" + "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ecb0b2cdaa0add708fe6f329ef65ae0c5225130b", - "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", + "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", "shasum": "" }, "require": { @@ -2275,7 +2275,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-08-03T14:17:41+00:00" + "time": "2017-08-20T05:47:52+00:00" }, { "name": "phpunit/phpunit", @@ -2572,12 +2572,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "9df1a9e73fc7caa573adaf98d159623048a7feed" + "reference": "3c88e062f6b3a510770efc654ce9e14d633bd8a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9df1a9e73fc7caa573adaf98d159623048a7feed", - "reference": "9df1a9e73fc7caa573adaf98d159623048a7feed", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3c88e062f6b3a510770efc654ce9e14d633bd8a8", + "reference": "3c88e062f6b3a510770efc654ce9e14d633bd8a8", "shasum": "" }, "conflict": { @@ -2603,8 +2603,9 @@ "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", "dompdf/dompdf": ">=0.6,<0.6.2", - "drupal/core": ">=8,<8.3.4", - "drupal/drupal": ">=8,<8.3.4", + "drupal/core": ">=8,<8.3.7", + "drupal/drupal": ">=8,<8.3.7", + "ezsystems/ezpublish-legacy": ">=5.4,<5.4.10|>=5.3,<5.3.12.1", "firebase/php-jwt": "<2", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", @@ -2632,7 +2633,7 @@ "silverstripe/framework": ">=3,<3.3", "silverstripe/userforms": "<3", "simplesamlphp/saml2": "<1.8.1|>=1.9,<1.9.1|>=1.10,<1.10.3|>=2,<2.3.3", - "simplesamlphp/simplesamlphp": "<1.14.15", + "simplesamlphp/simplesamlphp": "<1.14.16", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "socalnick/scn-social-auth": "<1.15.2", "squizlabs/php_codesniffer": ">=1,<2.8.1", @@ -2655,7 +2656,7 @@ "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2", "twig/twig": "<1.20", - "typo3/cms": ">=6.2,<6.2.30|>=8,<8.6.1|>=7,<7.6.16", + "typo3/cms": ">=6.2,<6.2.30|>=8,<8.7.5|>=7,<7.6.22", "typo3/flow": ">=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5|>=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "willdurand/js-translation-bundle": "<2.1.1", @@ -2701,7 +2702,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2017-08-08T18:44:50+00:00" + "time": "2017-09-06T14:29:44+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4000,16 +4001,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937" + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "shasum": "" }, "require": { @@ -4021,7 +4022,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -4055,7 +4056,7 @@ "portable", "shim" ], - "time": "2017-06-09T14:24:12+00:00" + "time": "2017-06-14T15:44:48+00:00" }, { "name": "symfony/translation", @@ -4309,27 +4310,27 @@ }, { "name": "zendframework/zend-code", - "version": "3.2.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "02944646c109fa53b6b6ab8b5269bb080fcdf5b4" + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/02944646c109fa53b6b6ab8b5269bb080fcdf5b4", - "reference": "02944646c109fa53b6b6ab8b5269bb080fcdf5b4", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "zendframework/zend-coding-standard": "^1.0.0", + "phpunit/phpunit": "^4.8.21", + "squizlabs/php_codesniffer": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { @@ -4339,8 +4340,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -4358,7 +4359,7 @@ "code", "zf2" ], - "time": "2017-07-23T13:06:00+00:00" + "time": "2016-10-24T13:23:32+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -4425,5 +4426,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "7.0" + } } From 96b572da0c1ce016266b471710686d21f27fba43 Mon Sep 17 00:00:00 2001 From: Steve Persch Date: Tue, 12 Sep 2017 16:03:15 -0500 Subject: [PATCH 2/2] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ff0eaa3a..68937ff8 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,9 @@ The parameters shown here are: * The machine name to be used by both the soon-to-be-created Pantheon site and GitHub repo. Change `my-new-site` to something meaningful for you. * The `--team` flag is optional and refers to a Pantheon organization. Pantheon organizations are often web development agencies or Universities. Setting this parameter causes the newly created site to go within the given organization. Run the Terminus command `terminus org:list` to see the organizations you are a member of. There might not be any. +#### PHP Version + +You will need PHP 7.0 or higher locally to run the `build:project:create` command as some of the dependencies in this project require it. Both `composer.json` and `pantheon.yml` are currently set to use PHP 7.0. ## Important files and directories