From a0a57f9df7a9f23a5109ef9398f180e433f7f8de Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 16 Dec 2019 12:04:40 +0100
Subject: - update to 4.0.0 - raise dependency on PHP 7.2 - use Chronos 2.0.1 -
 add Chronos, Console and Filesystem

---
 composer.json | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 12543c7..cab39fb 100644
--- a/composer.json
+++ b/composer.json
@@ -28,24 +28,31 @@
         "source": "https://github.com/cakephp/cakephp"
     },
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.2.0",
         "ext-intl": "*",
         "ext-mbstring": "*",
-        "cakephp/chronos": "^1.0.1",
         "aura/intl": "^3.0.0",
+        "cakephp/chronos": "^2.0",
+        "composer/ca-bundle": "^1.0",
+        "psr/http-client": "^1.0",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0",
         "psr/log": "^1.0.0",
         "psr/simple-cache": "^1.0.0",
-        "zendframework/zend-diactoros": "^1.4.0"
+        "zendframework/zend-diactoros": "^2.0",
+        "zendframework/zend-httphandlerrunner": "^1.0"
     },
     "suggest": {
         "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
         "ext-curl": "To enable more efficient network calls in Http\\Client.",
-        "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()"
+        "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()",
+        "paragonie/csp-builder": "CSP builder, to use the CSP Middleware"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "^3.0",
-        "cakephp/chronos": "^1.2.1",
-        "phpunit/phpunit": "^5.7.14|^6.0"
+        "cakephp/cakephp-codesniffer": "dev-next",
+        "mikey179/vfsstream": "^1.6",
+        "paragonie/csp-builder": "^2.3",
+        "phpunit/phpunit": "~8.4.0"
     },
     "autoload": {
         "psr-4": {
@@ -68,28 +75,26 @@
             "TestPluginTwo\\": "tests/test_app/Plugin/TestPluginTwo/src/",
             "Company\\TestPluginThree\\": "tests/test_app/Plugin/Company/TestPluginThree/src/",
             "Company\\TestPluginThree\\Test\\": "tests/test_app/Plugin/Company/TestPluginThree/tests/",
-            "ParentPlugin\\": "tests/test_app/Plugin/ParentPlugin/src/",
-            "PluginJs\\": "tests/test_app/Plugin/PluginJs/src/"
+            "ParentPlugin\\": "tests/test_app/Plugin/ParentPlugin/src/"
         }
     },
     "replace": {
         "cakephp/cache": "self.version",
         "cakephp/collection": "self.version",
+        "cakephp/console": "self.version",
         "cakephp/core": "self.version",
         "cakephp/datasource": "self.version",
         "cakephp/database": "self.version",
         "cakephp/event": "self.version",
         "cakephp/filesystem": "self.version",
         "cakephp/form": "self.version",
+        "cakephp/http": "self.version",
         "cakephp/i18n": "self.version",
         "cakephp/log": "self.version",
         "cakephp/orm": "self.version",
         "cakephp/utility": "self.version",
         "cakephp/validation": "self.version"
     },
-    "conflict": {
-        "phpunit/phpunit": "<5.7"
-    },
     "scripts": {
         "check": [
             "@cs-check",
@@ -99,7 +104,16 @@
         "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover=clover.xml",
-        "phpstan": "phpstan analyse -c phpstan.neon -l 2 src/",
-        "phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json"
+        "phpstan": "phpstan.phar analyse src/",
+        "psalm": "psalm.phar --show-info=false",
+        "stan": [
+            "@phpstan",
+            "@psalm"
+        ],
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12.0 psalm/phar:^3.7 && mv composer.backup composer.json"
+    },
+    "config": {
+        "sort-packages": true,
+        "process-timeout": 900
     }
 }
-- 
cgit