diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | composer.json | 79 | ||||
-rw-r--r-- | phinx-autoload.php | 1 | ||||
-rw-r--r-- | phinx.spec | 106 |
4 files changed, 126 insertions, 62 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/composer.json b/composer.json index cd871df..18b07b3 100644 --- a/composer.json +++ b/composer.json @@ -2,42 +2,52 @@ "name": "robmorgan/phinx", "type": "library", "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", - "keywords": ["phinx", "migrations", "database", "db", "database migrations"], + "keywords": [ + "phinx", + "migrations", + "database", + "db", + "database migrations" + ], "homepage": "https://phinx.org", "license": "MIT", - "authors": [{ - "name": "Rob Morgan", - "email": "robbym@gmail.com", - "homepage": "https://robmorgan.id.au", - "role": "Lead Developer" - }, { - "name": "Woody Gilk", - "email": "woody.gilk@gmail.com", - "homepage": "https://shadowhand.me", - "role": "Developer" - }, { - "name": "Richard Quadling", - "email": "rquadling@gmail.com", - "role": "Developer" - }, { - "name": "CakePHP Community", - "role": "Developer", - "homepage": "https://github.com/cakephp/phinx/graphs/contributors" - }], + "authors": [ + { + "name": "Rob Morgan", + "email": "robbym@gmail.com", + "homepage": "https://robmorgan.id.au", + "role": "Lead Developer" + }, + { + "name": "Woody Gilk", + "email": "woody.gilk@gmail.com", + "homepage": "https://shadowhand.me", + "role": "Developer" + }, + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com", + "role": "Developer" + }, + { + "name": "CakePHP Community", + "role": "Developer", + "homepage": "https://github.com/cakephp/phinx/graphs/contributors" + } + ], "require": { "php": ">=7.2", - "cakephp/collection": "^4.0", "cakephp/database": "^4.0", - "psr/container": "^1.0", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/config": "^3.4|^4.0|^5.0" + "psr/container": "^1.0 || ^2.0", + "symfony/console": "^3.4|^4.0|^5.0|^6.0", + "symfony/config": "^3.4|^4.0|^5.0|^6.0" }, "require-dev": { "ext-json": "*", "ext-pdo": "*", - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5|^9.3", "sebastian/comparator": ">=1.2.3", - "cakephp/cakephp-codesniffer": "^3.0", + "cakephp/cakephp-codesniffer": "^4.0", "symfony/yaml": "^3.4|^4.0|^5.0" }, "autoload": { @@ -60,11 +70,18 @@ "@test", "@cs-check" ], - "cs-check": "phpcs --colors -p -n --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=/tests/Phinx/Config/_rootDirectories/,/tests/log/ src/ tests/ app/", - "cs-fix": "phpcbf --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=/tests/Phinx/Config/_rootDirectories/,/tests/log/ src/ tests/ app/", - "stan": "phpstan analyse src/", - "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 && mv composer.backup composer.json", + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "stan": "phpstan analyse", + "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.9.0 && mv composer.backup composer.json", "test": "phpunit --colors=always" }, - "bin": ["bin/phinx"] + "bin": [ + "bin/phinx" + ], + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } + } } diff --git a/phinx-autoload.php b/phinx-autoload.php index 2d0ae77..d6d7d0c 100644 --- a/phinx-autoload.php +++ b/phinx-autoload.php @@ -5,7 +5,6 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Phinx\\', __DIR__); \Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/Cake4/Collection/autoload.php', '/usr/share/php/Cake4/Database/autoload.php', '/usr/share/php/Psr/Container/autoload.php', [ @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phinx # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2023 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,16 +10,16 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e8ac453951797408275b46a7fa4489dd63a93a67 +%global gh_commit 18e06e4a2b18947663438afd2f467e17c62e867d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner robmorgan #global gh_date 20150820 %global gh_project phinx %global psr0 Phinx -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests Name: %{gh_project} -Version: 0.12.2 +Version: 0.13.4 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: Manage the database migrations for your PHP app @@ -33,22 +33,20 @@ Source2: makesrc.sh Patch0: %{name}-version.patch BuildArch: noarch -%if %{with_tests} +%if %{with tests} BuildRequires: php(language) >= 7.2 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(cakephp/collection) >= 4.0 with php-composer(cakephp/collection) < 5) BuildRequires: (php-composer(cakephp/database) >= 4.0 with php-composer(cakephp/database) < 5) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) BuildRequires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 6) BuildRequires: (php-composer(symfony/config) >= 3.4 with php-composer(symfony/config) < 6) BuildRequires: (php-composer(symfony/yaml) >= 3.4 with php-composer(symfony/yaml) < 6) %else -BuildRequires: php-cakephp4-collection BuildRequires: php-cakephp4-database BuildRequires: php-psr-container -BuildRequires: php-symfony3-console >= 3.4 -BuildRequires: php-symfony3-config >= 3.4 -BuildRequires: php-symfony3-yaml >= 3.4 +BuildRequires: php-symfony4-console +BuildRequires: php-symfony4-config +BuildRequires: php-symfony4-yaml %endif BuildRequires: php-pdo BuildRequires: php-date @@ -58,42 +56,44 @@ BuildRequires: php-spl # For tests, from composer.json "require-dev": { # "ext-json": "*", # "ext-pdo": "*", -# "phpunit/phpunit": ^8.5", +# "phpunit/phpunit": ^8.5|^9.3", # "sebastian/comparator": ">=1.2.3", -# "cakephp/cakephp-codesniffer": "^3.0", +# "cakephp/cakephp-codesniffer": "^4.0", # "symfony/yaml": "^3.4|^4.0|^5.0" +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 +%else %global phpunit %{_bindir}/phpunit8 BuildRequires: phpunit8 %endif +%endif # For autoloader BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=7.2", -# "cakephp/collection": "^4.0", # "cakephp/database": "^4.0", -# "psr/container": "^1.0", -# "symfony/console": "^3.4|^4.0|^5.0", -# "symfony/config": "^3.4|^4.0|^5.0" +# "psr/container": "^1.0 || ^2.0", +# "symfony/console": "^3.4|^4.0|^5.0|^6.0", +# "symfony/config": "^3.4|^4.0|^5.0|^6.0" # From composer.json, "suggest": { # "ext-json": "Install if using JSON configuration format", # "ext-pdo": "PDO extension is needed", # "symfony/yaml": "Install if using YAML configuration format" Requires: php(language) >= 7.2 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(cakephp/collection) >= 4.0 with php-composer(cakephp/collection) < 5) Requires: (php-composer(cakephp/database) >= 4.0 with php-composer(cakephp/database) < 5) Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) Requires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 6) Requires: (php-composer(symfony/config) >= 3.4 with php-composer(symfony/config) < 6) Requires: (php-composer(symfony/yaml) >= 3.4 with php-composer(symfony/yaml) < 6) %else -Requires: php-cakephp4-collection Requires: php-cakephp4-database Requires: php-psr-container -Requires: php-symfony3-console >= 3.4 -Requires: php-symfony3-config >= 3.4 -Requires: php-symfony3-yaml >= 3.4 +Requires: php-symfony4-console +Requires: php-symfony4-config +Requires: php-symfony4-yaml %endif # From phpcompatinfo report for 0.6.4 Requires: php-pdo @@ -156,7 +156,7 @@ install -Dpm 755 phinx %{buildroot}%{_bindir}/phinx %check -%if %{with_tests} +%if %{with tests} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php @@ -164,22 +164,18 @@ require '%{buildroot}%{_datadir}/php/%{psr0}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Test\\Phinx\\', dirname(__DIR__).'/tests/Phinx'); EOF -%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?rhel} == 7 : SQLite is too old -sed -e '/_ENABLED/s/true/false/' \ - phpunit.xml.dist >phpunit.xml -%else -sed -e '/_ENABLED/s/true/false/;/SQLITE_ENABLED/s/false/true/' \ - phpunit.xml.dist >phpunit.xml +rm tests/Phinx/Db/Adapter/SQLiteAdapterTest.php %endif : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php72 php73 php74; do +for cmd in "php %{phpunit}" php80 php81 php82; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit8} \ + $1 ${2:-%{_bindir}/phpunit9} \ --no-coverage || ret=1 fi done @@ -200,6 +196,56 @@ exit $ret %changelog +* Mon Jan 9 2023 Remi Collet <remi@remirepo.net> - 0.13.4-1 +- update to 0.13.4 + +* Fri Dec 9 2022 Remi Collet <remi@remirepo.net> - 0.13.3-1 +- update to 0.13.3 + +* Mon Dec 5 2022 Remi Collet <remi@remirepo.net> - 0.13.2-1 +- update to 0.13.2 + +* Tue Oct 11 2022 Remi Collet <remi@remirepo.net> - 0.13.1-1 +- update to 0.13.1 + +* Fri Oct 7 2022 Remi Collet <remi@remirepo.net> - 0.13.0-1 +- update to 0.13.0 + +* Mon Oct 3 2022 Remi Collet <remi@remirepo.net> - 0.12.13-1 +- update to 0.12.13 + +* Mon Jul 18 2022 Remi Collet <remi@remirepo.net> - 0.12.12-1 +- update to 0.12.12 + +* Mon Jul 4 2022 Remi Collet <remi@remirepo.net> - 0.12.11-1 +- update to 0.12.11 + +* Mon Jan 24 2022 Remi Collet <remi@remirepo.net> - 0.12.10-1 +- update to 0.12.10 + +* Tue Oct 12 2021 Remi Collet <remi@remirepo.net> - 0.12.9-1 +- update to 0.12.9 + +* Fri Sep 3 2021 Remi Collet <remi@remirepo.net> - 0.12.8-1 +- update to 0.12.8 + +* Wed May 19 2021 Remi Collet <remi@remirepo.net> - 0.12.7-1 +- update to 0.12.7 + +* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 0.12.6-1 +- update to 0.12.6 + +* Mon Jan 25 2021 Remi Collet <remi@remirepo.net> - 0.12.5-1 +- update to 0.12.5 +- switch to phpunit9 + +* Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 0.12.4-1 +- update to 0.12.4 +- drop dependency on cakephp/collection + +* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 0.12.3-1 +- update to 0.12.3 + * Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 0.12.2-1 - update to 0.12.2 - add dependency on psr/container |