From c0d5832ff259a49e8c0951fb391dea8026fa121b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Jan 2019 16:13:39 +0100 Subject: downgrade to 1.5.0 --- composer.json | 32 ++++++------ php-doctrine-migrations.spec | 114 +++++++++++++++++++++++-------------------- 2 files changed, 76 insertions(+), 70 deletions(-) diff --git a/composer.json b/composer.json index 3217b5c..456a9b9 100644 --- a/composer.json +++ b/composer.json @@ -3,36 +3,36 @@ "type": "library", "description": "Database Schema migrations using Doctrine DBAL", "keywords": ["migrations", "database"], - "homepage": "https://www.doctrine-project.org/projects/migrations.html", - "license": "MIT", + "homepage": "http://www.doctrine-project.org", + "license": "LGPL-2.1", "authors": [ {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"}, {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}, {"name": "Michael Simonson", "email": "contact@mikesimonson.com" } ], "require": { - "php": "^7.1", - "doctrine/dbal": "~2.6", - "symfony/console": "~3.3|^4.0", + "php": "^5.5|^7.0", + "doctrine/dbal": "~2.2", + "symfony/yaml": "~2.3|~3.0", + "symfony/console": "~2.3|~3.0", "ocramius/proxy-manager": "^1.0|^2.0" }, "require-dev": { - "doctrine/orm": "~2.5", - "symfony/yaml": "~3.3|^4.0", - "phpunit/phpunit": "~7.0", - "doctrine/coding-standard": "^1.0", + "doctrine/orm": "2.*", + "phpunit/phpunit": "~4.7", + "satooshi/php-coveralls": "^1.0", + "doctrine/coding-standard": "dev-master", + "mockery/mockery": "^0.9.4", + "johnkary/phpunit-speedtrap": "~1.0@dev", "jdorn/sql-formatter": "~1.1", - "mikey179/vfsStream": "^1.6", - "squizlabs/php_codesniffer": "^3.0" + "mikey179/vfsStream": "^1.6" }, "suggest": { - "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.", - "symfony/yaml": "Allows the use of yaml for migration configuration files." + "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command." }, "autoload": { "psr-4": { - "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations", - "Doctrine\\Migrations\\": "lib/Doctrine/Migrations" + "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations" } }, "autoload-dev": { @@ -42,7 +42,7 @@ }, "extra": { "branch-alias": { - "dev-master": "v1.8.x-dev" + "dev-master": "v1.6.x-dev" } }, "bin": [ diff --git a/php-doctrine-migrations.spec b/php-doctrine-migrations.spec index d32133e..add5499 100644 --- a/php-doctrine-migrations.spec +++ b/php-doctrine-migrations.spec @@ -8,7 +8,7 @@ # %global bootstrap 0 -%global gh_commit 215438c0eef3e5f9b7da7d09c6b90756071b43e6 +%global gh_commit c81147c0f2938a6566594455367e095150547f72 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project migrations @@ -25,11 +25,11 @@ %endif Name: php-%{pk_vendor}-%{pk_project} -Version: 1.8.1 +Version: 1.5.0 Release: 1%{?dist} Summary: PHP Doctrine Migrations project -License: MIT +License: LGPLv2+ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -37,7 +37,7 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 5.5 BuildRequires: php-reflection BuildRequires: php-simplexml BuildRequires: php-date @@ -49,65 +49,70 @@ BuildRequires: php-phar BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(doctrine/dbal) >= 2.6 with php-composer(doctrine/dbal) < 3) -BuildRequires: (php-composer(symfony/console) >= 3.3 with php-composer(symfony/console) < 5) +BuildRequires: (php-composer(doctrine/dbal) >= 2.2 with php-composer(doctrine/dbal) < 3) +BuildRequires: (php-composer(symfony/yaml) >= 2.3 with php-composer(symfony/yaml) < 4) +BuildRequires: (php-composer(symfony/console) >= 2.3 with php-composer(symfony/console) < 4) BuildRequires: (php-composer(ocramius/proxy-manager) >= 2.0 with php-composer(ocramius/proxy-manager) < 3) # From composer.json # "require-dev": { -# "doctrine/orm": "~2.5", -# "symfony/yaml": "~3.3|^4.0", -# "phpunit/phpunit": "~7.0", -# "doctrine/coding-standard": "^1.0", +# "doctrine/orm": "2.*", +# "phpunit/phpunit": "~4.7", +# "satooshi/php-coveralls": "^1.0", +# "doctrine/coding-standard": "dev-master", +# "mockery/mockery": "^0.9.4", +# "johnkary/phpunit-speedtrap": "~1.0@dev", # "jdorn/sql-formatter": "~1.1", -# "mikey179/vfsStream": "^1.6", -# "squizlabs/php_codesniffer": "^3.0" -BuildRequires: (php-composer(doctrine/orm) >= 2.5 with php-composer(doctrine/orm) < 3) -BuildRequires: (php-composer(symfony/yaml) >= 3.3 with php-composer(symfony/yaml) < 5) +# "mikey179/vfsStream": "^1.6" +BuildRequires: (php-composer(doctrine/orm) >= 2.0 with php-composer(doctrine/orm) < 3) +BuildRequires: (php-composer(mockery/mockery) >= 0.9 with php-composer(mockery/mockery) < 1) BuildRequires: (php-composer(jdorn/sql-formatter) >= 1.1 with php-composer(jdorn/sql-formatter) < 2) BuildRequires: (php-composer(mikey179/vfsStream) >= 1.6 with php-composer(mikey179/vfsStream) < 2) -# remirepo:14 +# remirepo:16 %else BuildRequires: php-composer(doctrine/dbal) < 3 -BuildRequires: php-composer(doctrine/dbal) >= 2.6 -BuildRequires: php-symfony3-console >= 3.3 +BuildRequires: php-composer(doctrine/dbal) >= 2.2 +BuildRequires: php-symfony3-yaml +BuildRequires: php-symfony3-console BuildRequires: php-composer(ocramius/proxy-manager) < 3 -BuildRequires: php-composer(ocramius/proxy-manager) >= 2.0 +BuildRequires: php-composer(ocramius/proxy-manager) >= 1.0 BuildRequires: php-composer(doctrine/orm) < 3 -BuildRequires: php-composer(doctrine/orm) >= 2.5 -BuildRequires: php-symfony3-yaml >= 3.3 +BuildRequires: php-composer(doctrine/orm) >= 2.0 +BuildRequires: php-composer(mockery/mockery) < 1 +BuildRequires: php-composer(mockery/mockery) >= 0.9 BuildRequires: php-composer(jdorn/sql-formatter) < 2 BuildRequires: php-composer(jdorn/sql-formatter) >= 1.1 BuildRequires: php-composer(mikey179/vfsStream) < 2 BuildRequires: php-composer(mikey179/vfsStream) >= 1.6 %endif -BuildRequires: phpunit7 +BuildRequires: phpunit %endif # From composer.json # "require": { -# "php": "^7.1", -# "doctrine/dbal": "~2.6", -# "symfony/console": "~3.3|^4.0", +# "php": "^5.5|^7.0", +# "doctrine/dbal": "~2.2", +# "symfony/yaml": "~2.3|~3.0", +# "symfony/console": "~2.3|~3.0", # "ocramius/proxy-manager": "^1.0|^2.0" # "suggest": { -# "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.", -# "symfony/yaml": "Allows the use of yaml for migration configuration files." +# "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command." -Requires: php(language) >= 7.1 +Requires: php(language) >= 5.5 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(doctrine/dbal) >= 2.6 with php-composer(doctrine/dbal) < 3) -Requires: (php-composer(symfony/console) >= 3.3 with php-composer(symfony/console) < 5) -Requires: (php-composer(ocramius/proxy-manager) >= 2.0 with php-composer(ocramius/proxy-manager) < 3) +Requires: (php-composer(doctrine/dbal) >= 2.2 with php-composer(doctrine/dbal) < 3) +Requires: (php-composer(symfony/yaml) >= 2.3 with php-composer(symfony/yaml) < 4) +Requires: (php-composer(symfony/console) >= 2.3 with php-composer(symfony/console) < 4) +Requires: (php-composer(ocramius/proxy-manager) >= 1.0 with php-composer(ocramius/proxy-manager) < 3) Recommends: (php-composer(mikey179/vfsStream) >= 1.6 with php-composer(mikey179/vfsStream) < 2) -Recommends: (php-composer(symfony/yaml) >= 3.3 with php-composer(symfony/yaml) < 5) -# remirepo:7 +# remirepo:8 %else Requires: php-composer(doctrine/dbal) < 3 -Requires: php-composer(doctrine/dbal) >= 2.6 -Requires: php-symfony3-console >= 3.3 +Requires: php-composer(doctrine/dbal) >= 2.2 +Requires: php-symfony3-yaml +Requires: php-symfony3-console Requires: php-composer(ocramius/proxy-manager) < 3 -Requires: php-composer(ocramius/proxy-manager) >= 2.0 +Requires: php-composer(ocramius/proxy-manager) >= 1.0 %endif # From phpcompatinfo report for version 1.8.1 Requires: php-simplexml @@ -141,33 +146,32 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %build : Generate a simple autoloader %{_bindir}/phpab \ - --output lib/%{ns_vendor}/%{ns_project}/autoload.php \ + --output lib/%{ns_vendor}/DBAL/%{ns_project}/autoload.php \ --template fedora \ lib/%{ns_vendor} -cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_project}/autoload.php +cat << 'EOF' | tee -a lib/%{ns_vendor}/DBAL/%{ns_project}/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/%{ns_vendor}/DBAL/autoload.php', [ - '%{_datadir}/php/Symfony4/Component/Console/autoload.php', + '%{_datadir}/php/Symfony3/Component/Yaml/autoload.php', + '%{_datadir}/php/Symfony/Component/Yaml/autoload.php', + ], + [ '%{_datadir}/php/Symfony3/Component/Console/autoload.php', + '%{_datadir}/php/Symfony/Component/Console/autoload.php', ], '%{_datadir}/php/ProxyManager/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ '%{_datadir}/php/jdorn-sql-formatter/autoload.php', - [ - '%{_datadir}/php/Symfony4/Component/Yaml/autoload.php', - '%{_datadir}/php/Symfony3/Component/Yaml/autoload.php', - ], ]); EOF %install mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} -cp -pr lib/%{ns_vendor}/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} cp -pr lib/%{ns_vendor}/DBAL %{buildroot}%{_datadir}/php/%{ns_vendor}/DBAL @@ -182,25 +186,25 @@ mkdir vendor cat << 'EOF' | tee -a vendor/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php', + '%{buildroot}%{_datadir}/php/%{ns_vendor}/DBAL/%{ns_project}/autoload.php', '%{_datadir}/php/%{ns_vendor}/ORM/autoload.php', - '%{_datadir}/php/org/bovigo/vfs/visitor/vfsStreamVisitor.php', + '%{_datadir}/php/Mockery/autoload.php', + '%{_datadir}/php/org/bovigo/vfs/autoload.php', ]); +date_default_timezone_set('UTC'); EOF # need investigation (migrations directory deleted during test suite?) chmod -w tests/Doctrine/DBAL/Migrations/Tests/Functional/_files +: disable the listener as johnkary/phpunit-speedtrap not available +sed -e s/listeners/nolisteners/ phpunit.xml.dist >phpunit.xml + : Run test suite ret=0 -for cmd in php php71 php72 php73; do - if which $cmd; then - $cmd %{_bindir}/phpunit7 \ - --bootstrap vendor/autoload.php \ - --verbose || ret=1 - fi -done -find . -name migrations +%{_bindir}/phpunit \ + --bootstrap vendor/autoload.php \ + --verbose || ret=1 # restore chmod +w tests/Doctrine/DBAL/Migrations/Tests/Functional/_files @@ -217,10 +221,12 @@ exit $ret %license LICENSE %doc *.md %doc composer.json -%{_datadir}/php/%{ns_vendor}/%{ns_project}/ %{_datadir}/php/%{ns_vendor}/DBAL/%{ns_project} %changelog +* Thu Jan 3 2019 Remi Collet - 1.5.0-1 +- downgrade to 1.5.0 + * Thu Jan 3 2019 Remi Collet - 1.8.1-1 - initial package, version 1.8.1 -- cgit