summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer-chronos.json8
-rw-r--r--composer.json13
-rw-r--r--php-cakephp.spec83
-rw-r--r--src/Cache/composer.json2
-rw-r--r--src/Collection/composer.json2
-rw-r--r--src/Console/composer.json42
-rw-r--r--src/Core/composer.json2
-rw-r--r--src/Database/composer.json2
-rw-r--r--src/Datasource/composer.json2
-rw-r--r--src/Event/composer.json2
-rw-r--r--src/Filesystem/composer.json2
-rw-r--r--src/Form/composer.json2
-rw-r--r--src/Http/composer.json49
-rw-r--r--src/I18n/composer.json2
-rw-r--r--src/Log/composer.json2
-rw-r--r--src/ORM/composer.json2
-rw-r--r--src/Utility/composer.json2
-rw-r--r--src/Validation/composer.json2
18 files changed, 194 insertions, 27 deletions
diff --git a/composer-chronos.json b/composer-chronos.json
index 6aa3f87..d63b284 100644
--- a/composer-chronos.json
+++ b/composer-chronos.json
@@ -26,14 +26,13 @@
"source": "https://github.com/cakephp/chronos"
},
"require": {
- "php": "^5.5.9|^7"
+ "php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "<6.0 || ^7.0",
"athletic/athletic": "~0.1",
"cakephp/cakephp-codesniffer": "^3.0",
- "phpbench/phpbench": "@dev",
- "phpstan/phpstan": "^0.6.4"
+ "phpbench/phpbench": "@dev"
},
"autoload": {
"psr-4": {
@@ -57,6 +56,7 @@
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"bench": "phpbench run",
- "phpstan": "phpstan analyze -c phpstan.neon -l 3 src tests"
+ "phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json",
+ "phpstan": "phpstan analyze -c phpstan.neon -l 3 src/"
}
}
diff --git a/composer.json b/composer.json
index 12543c7..00ddd6f 100644
--- a/composer.json
+++ b/composer.json
@@ -28,24 +28,27 @@
"source": "https://github.com/cakephp/cakephp"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"ext-intl": "*",
"ext-mbstring": "*",
"cakephp/chronos": "^1.0.1",
"aura/intl": "^3.0.0",
+ "laminas/laminas-diactoros": "^1.4.0",
"psr/log": "^1.0.0",
"psr/simple-cache": "^1.0.0",
- "zendframework/zend-diactoros": "^1.4.0"
+ "paragonie/random_compat": "^1.4|^2.0|9.99.99"
},
"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"
+ "phpunit/phpunit": "^5.7.14|^6.0",
+ "paragonie/csp-builder": "^1.4|^2.3"
},
"autoload": {
"psr-4": {
@@ -100,6 +103,6 @@
"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-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 --no-update && composer update && mv composer.backup composer.json"
}
}
diff --git a/php-cakephp.spec b/php-cakephp.spec
index 6a9ae49..094fd27 100644
--- a/php-cakephp.spec
+++ b/php-cakephp.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-cakephp
#
-# Copyright (c) 2018-2019 Remi Collet
+# Copyright (c) 2018-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -8,7 +8,7 @@
#
# https://github.com/cakephp/cakephp/releases
-%global gh_commit 34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc
+%global gh_commit 3fbf70a74b78bf6328c3afafdfe1b8d6cf6db4e7
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner cakephp
%global gh_project cakephp
@@ -18,12 +18,12 @@
%global with_tests 0%{!?_without_tests:1}
# https://github.com/cakephp/chronos/releases
-%global chronos_commit 0292f06e8cc23fc82f0574889da2d8bf27b613c1
+%global chronos_commit ba2bab98849e7bf29b02dd634ada49ab36472959
%global chronos_short %(c=%{chronos_commit}; echo ${c:0:7})
-%global chronos_version 1.2.8
+%global chronos_version 1.3.0
Name: php-%{pk_vendor}
-Version: 3.8.6
+Version: 3.10.2
Release: 1%{?dist}
Summary: The CakePHP framework
@@ -65,6 +65,7 @@ BuildRequires: php-aura-intl >= 3.0.0
BuildRequires: php-PsrLog >= 1.0.0
BuildRequires: php-zendframework-zend-diactoros >= 1.4.0
%endif
+BuildRequires: php-paragonie-random-compat
%endif
@@ -240,6 +241,7 @@ Requires: php-composer(%{pk_vendor}/core) = %{version}
# From phpcompatinfo report
Requires: php-pcre
Requires: php-spl
+Provides: php-composer(%{pk_vendor}/event) = %{version}
%description event
CakePHP Event Library:
@@ -278,6 +280,7 @@ Summary: CakePHP Utility Classes
# "cakephp/core": "^3.6.0"
Requires: php(language) >= 5.6
Requires: php-composer(%{pk_vendor}/core) = %{version}
+Requires: php-paragonie-random-compat
# From phpcompatinfo report
Requires: php-simplexml
Requires: php-ctype
@@ -330,6 +333,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
'%{php_home}/Psr/Log/autoload.php',
'%{php_home}/Psr/SimpleCache/autoload.php',
'%{php_home}/Zend/Diactoros/autoload.php',
+ '%{php_home}/random_compat/autoload.php',
]);
EOF
@@ -425,6 +429,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required([
dirname(__DIR__) . '/Core/autoload.php',
__DIR__ . '/bootstrap.php',
+ '%{php_home}/random_compat/autoload.php',
]);
EOF
@@ -481,7 +486,11 @@ exit (class_exists("Cake\\Utility\\Hash") ? 0 : 1);
: Run upstream test suites
ret=0
phpunit tests/TestCase/Cache --verbose || ret=1
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+: skip for missing laminas used in Http component
+%else
phpunit tests/TestCase/Core --verbose || ret=1
+%endif
phpunit tests/TestCase/Collection --verbose || ret=1
%if 0%{?rhel} == 6
: skip suite as sqlite is too old
@@ -582,6 +591,70 @@ exit $ret
%changelog
+* Mon Dec 13 2021 Remi Collet <remi@remirepo.net> - 3.10.2-1
+- update to 3.10.2
+
+* Tue Nov 2 2021 Remi Collet <remi@remirepo.net> - 3.10.1-1
+- update to 3.10.1
+
+* Mon Jun 21 2021 Remi Collet <remi@remirepo.net> - 3.10.0-1
+- update to 3.10.0
+
+* Mon May 31 2021 Remi Collet <remi@remirepo.net> - 3.9.10-1
+- update to 3.9.10
+
+* Wed Apr 28 2021 Remi Collet <remi@remirepo.net> - 3.9.9-1
+- update to 3.9.9
+
+* Wed Mar 10 2021 Remi Collet <remi@remirepo.net> - 3.9.8-1
+- update to 3.9.8
+
+* Mon Mar 8 2021 Remi Collet <remi@remirepo.net> - 3.9.7-1
+- update to 3.9.7
+
+* Mon Jan 25 2021 Remi Collet <remi@remirepo.net> - 3.9.6-1
+- update to 3.9.6
+
+* Wed Jan 6 2021 Remi Collet <remi@remirepo.net> - 3.9.5-1
+- update to 3.9.5
+
+* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 3.9.4-1
+- update to 3.9.4
+
+* Tue Oct 6 2020 Remi Collet <remi@remirepo.net> - 3.9.3-1
+- update to 3.9.3
+
+* Mon Aug 31 2020 Remi Collet <remi@remirepo.net> - 3.9.2-1
+- update to 3.9.2
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 3.9.1-1
+- update to 3.9.1
+
+* Mon Jun 22 2020 Remi Collet <remi@remirepo.net> - 3.9.0-1
+- update to 3.9.0
+- add dependency on paragonie/random_compat
+
+* Fri May 8 2020 Remi Collet <remi@remirepo.net> - 3.8.12-1
+- update to 3.8.12
+
+* Mon Apr 6 2020 Remi Collet <remi@remirepo.net> - 3.8.11-1
+- update to 3.8.11
+
+* Sat Feb 22 2020 Remi Collet <remi@remirepo.net> - 3.8.10-1
+- update to 3.8.10
+
+* Mon Jan 27 2020 Remi Collet <remi@remirepo.net> - 3.8.9-1
+- update to 3.8.9
+
+* Thu Jan 2 2020 Remi Collet <remi@remirepo.net> - 3.8.8-1
+- update to 3.8.8
+
+* Mon Dec 9 2019 Remi Collet <remi@remirepo.net> - 3.8.7-1
+- update to 3.8.7
+
+* Tue Dec 3 2019 Remi Collet <remi@remirepo.net> - 3.8.6-2
+- use Chronos 1.3.0
+
* Thu Nov 7 2019 Remi Collet <remi@remirepo.net> - 3.8.6-1
- update to 3.8.6
diff --git a/src/Cache/composer.json b/src/Cache/composer.json
index 2760303..c417e36 100644
--- a/src/Cache/composer.json
+++ b/src/Cache/composer.json
@@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/cache"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"psr/simple-cache": "^1.0.0",
"cakephp/core": "^3.6.0"
},
diff --git a/src/Collection/composer.json b/src/Collection/composer.json
index 47a24c4..f638264 100644
--- a/src/Collection/composer.json
+++ b/src/Collection/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/collection"
},
"require": {
- "php": ">=5.6.0"
+ "php": ">=5.6.0,<8.0.0"
},
"autoload": {
"psr-4": {
diff --git a/src/Console/composer.json b/src/Console/composer.json
new file mode 100644
index 0000000..971d9a6
--- /dev/null
+++ b/src/Console/composer.json
@@ -0,0 +1,42 @@
+{
+ "name": "cakephp/console",
+ "description": "Build beautiful console applications with CakePHP",
+ "type": "library",
+ "keywords": [
+ "cakephp",
+ "console",
+ "cli",
+ "framework"
+ ],
+ "homepage": "https://cakephp.org",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "CakePHP Community",
+ "homepage": "https://github.com/cakephp/cache/graphs/contributors"
+ }
+ ],
+ "support": {
+ "issues": "https://github.com/cakephp/cakephp/issues",
+ "forum": "https://stackoverflow.com/tags/cakephp",
+ "irc": "irc://irc.freenode.org/cakephp",
+ "source": "https://github.com/cakephp/console"
+ },
+ "require": {
+ "php": ">=7.2.0",
+ "cakephp/core": "^4.0",
+ "cakephp/event": "^4.0",
+ "cakephp/filesystem": "^4.0",
+ "cakephp/log": "^4.0",
+ "cakephp/utility": "^4.0"
+ },
+ "suggest": {
+ "cakephp/datasource": "To use the Shell or Command base classes",
+ "cakephp/orm": "To use the Shell or Command base classes"
+ },
+ "autoload": {
+ "psr-4": {
+ "Cake\\Console\\": "."
+ }
+ }
+}
diff --git a/src/Core/composer.json b/src/Core/composer.json
index 0ee9afc..815c276 100644
--- a/src/Core/composer.json
+++ b/src/Core/composer.json
@@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/core"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/utility": "^3.6.0"
},
"suggest": {
diff --git a/src/Database/composer.json b/src/Database/composer.json
index c197115..839ffbf 100644
--- a/src/Database/composer.json
+++ b/src/Database/composer.json
@@ -24,7 +24,7 @@
"source": "https://github.com/cakephp/database"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/cache": "^3.6.0",
"cakephp/core": "^3.6.0",
"cakephp/datasource": "^3.6.0",
diff --git a/src/Datasource/composer.json b/src/Datasource/composer.json
index 7846db2..a1a9c12 100644
--- a/src/Datasource/composer.json
+++ b/src/Datasource/composer.json
@@ -24,7 +24,7 @@
"source": "https://github.com/cakephp/datasource"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/core": "^3.6.0"
},
"suggest": {
diff --git a/src/Event/composer.json b/src/Event/composer.json
index e984d41..c0fd411 100644
--- a/src/Event/composer.json
+++ b/src/Event/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/event"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/core": "^3.6.0"
},
"autoload": {
diff --git a/src/Filesystem/composer.json b/src/Filesystem/composer.json
index e5dcb07..62dc4ff 100644
--- a/src/Filesystem/composer.json
+++ b/src/Filesystem/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/filesystem"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/core": "^3.6.0"
},
"autoload": {
diff --git a/src/Form/composer.json b/src/Form/composer.json
index 5e1dfdc..f186aa5 100644
--- a/src/Form/composer.json
+++ b/src/Form/composer.json
@@ -21,7 +21,7 @@
"source": "https://github.com/cakephp/form"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/event": "^3.6.0",
"cakephp/validation": "^3.6.0"
},
diff --git a/src/Http/composer.json b/src/Http/composer.json
new file mode 100644
index 0000000..5802f3e
--- /dev/null
+++ b/src/Http/composer.json
@@ -0,0 +1,49 @@
+{
+ "name": "cakephp/http",
+ "description": "CakePHP HTTP client and PSR7/15 middleware libraries",
+ "type": "library",
+ "keywords": [
+ "cakephp",
+ "http",
+ "psr7",
+ "psr15"
+ ],
+ "homepage": "https://cakephp.org",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "CakePHP Community",
+ "homepage": "https://github.com/cakephp/http/graphs/contributors"
+ }
+ ],
+ "support": {
+ "issues": "https://github.com/cakephp/cakephp/issues",
+ "forum": "https://stackoverflow.com/tags/cakephp",
+ "irc": "irc://irc.freenode.org/cakephp",
+ "source": "https://github.com/cakephp/http"
+ },
+ "require": {
+ "php": ">=7.2.0",
+ "cakephp/core": "^4.0",
+ "cakephp/event": "^4.0",
+ "cakephp/utility": "^4.0",
+ "composer/ca-bundle": "^1.2",
+ "psr/http-client": "^1.0",
+ "psr/http-server-handler": "^1.0",
+ "psr/http-server-middleware": "^1.0",
+ "laminas/laminas-diactoros": "^2.1",
+ "laminas/laminas-httphandlerrunner": "^1.0"
+ },
+ "provide": {
+ "psr/http-client-implementation": "^1.0"
+ },
+ "suggest": {
+ "cakephp/cache": "To use cache session storage",
+ "cakephp/orm": "To use database session storage"
+ },
+ "autoload": {
+ "psr-4": {
+ "Cake\\Http\\": "."
+ }
+ }
+}
diff --git a/src/I18n/composer.json b/src/I18n/composer.json
index 7ffc86f..611e487 100644
--- a/src/I18n/composer.json
+++ b/src/I18n/composer.json
@@ -28,7 +28,7 @@
"source": "https://github.com/cakephp/i18n"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"ext-intl": "*",
"cakephp/core": "^3.6.0",
"cakephp/chronos": "^1.0.0",
diff --git a/src/Log/composer.json b/src/Log/composer.json
index a775a4f..eeb2dac 100644
--- a/src/Log/composer.json
+++ b/src/Log/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/log"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/core": "^3.6.0",
"psr/log": "^1.0.0"
},
diff --git a/src/ORM/composer.json b/src/ORM/composer.json
index 1432893..0ebc7f7 100644
--- a/src/ORM/composer.json
+++ b/src/ORM/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/orm"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/collection": "^3.6.0",
"cakephp/core": "^3.6.0",
"cakephp/datasource": "^3.6.0",
diff --git a/src/Utility/composer.json b/src/Utility/composer.json
index 4c5c8f1..bf5d684 100644
--- a/src/Utility/composer.json
+++ b/src/Utility/composer.json
@@ -25,7 +25,7 @@
"source": "https://github.com/cakephp/utility"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/core": "^3.6.0"
},
"suggest": {
diff --git a/src/Validation/composer.json b/src/Validation/composer.json
index e4de56a..db585a3 100644
--- a/src/Validation/composer.json
+++ b/src/Validation/composer.json
@@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/validation"
},
"require": {
- "php": ">=5.6.0",
+ "php": ">=5.6.0,<8.0.0",
"cakephp/core": "^3.6.0",
"cakephp/utility": "^3.6.0",
"psr/http-message": "^1.0.0"
generated by cgit (git 2.34.1) at 2024-04-24 08:44:10 +0000