diff options
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-doctrine-common3.spec | 36 |
2 files changed, 28 insertions, 16 deletions
diff --git a/composer.json b/composer.json index 6e62405..ff64cc1 100644 --- a/composer.json +++ b/composer.json @@ -26,19 +26,19 @@ "phpstan/phpstan": "^1.4.1", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", - "doctrine/coding-standard": "^9.0", + "doctrine/coding-standard": "^9.0 || ^10.0", "squizlabs/php_codesniffer": "^3.0", - "symfony/phpunit-bridge": "^4.0.5", + "symfony/phpunit-bridge": "^6.1", "vimeo/psalm": "^4.4" }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\Common\\": "src" } }, "autoload-dev": { "psr-4": { - "Doctrine\\Tests\\": "tests/Doctrine/Tests" + "Doctrine\\Tests\\": "tests" } }, "config": { diff --git a/php-doctrine-common3.spec b/php-doctrine-common3.spec index d6750ec..7d1737d 100644 --- a/php-doctrine-common3.spec +++ b/php-doctrine-common3.spec @@ -10,8 +10,8 @@ %global github_owner doctrine %global github_name common -%global github_version 3.3.1 -%global github_commit 6a76bd25b1030d35d6ba2bf2f69ca858a41fc580 +%global github_version 3.4.1 +%global github_commit 616d5fca274ea66b969cdebbbfd1dc33a87d461b %global major 3 %global composer_vendor doctrine @@ -109,10 +109,10 @@ Autoloader: %{phpdir}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %build : Create autoloader phpab --template fedora \ - --output lib/%{ns_vendor}/%{ns_project}/autoload.php \ - lib/%{ns_vendor}/%{ns_project} + --output src/autoload.php \ + src -cat <<'AUTOLOAD' | tee -a lib/%{ns_vendor}/%{ns_project}/autoload.php +cat <<'AUTOLOAD' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ [ '%{phpdir}/%{ns_vendor}/Persistence3/autoload.php', @@ -123,23 +123,29 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/%{ns_vendor} -cp -rp lib/%{ns_vendor}/%{ns_project} %{buildroot}%{phpdir}/%{ns_vendor}/%{ns_project}%{major} +mkdir -p %{buildroot}%{phpdir}/%{ns_vendor} +cp -rp src %{buildroot}%{phpdir}/%{ns_vendor}/%{ns_project}%{major} %check %if %{with_tests} -: Modify tests init -sed "s#require.*autoload.*#require_once '%{buildroot}%{phpdir}/%{ns_vendor}/%{ns_project}%{major}/autoload.php'; require_once '%{phpdir}/%{ns_vendor}/Common/Collections/autoload.php';#" \ - -i tests/%{ns_vendor}/Tests/TestInit.php - +cat << 'AUTOLOAD' | tee bs.php +<?php +require_once '%{buildroot}%{phpdir}/%{ns_vendor}/%{ns_project}%{major}/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/%{ns_vendor}/Common/Collections/autoload.php', +]); +\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Tests\\', __DIR__ . '/tests'); +AUTOLOAD : Upstream tests RETURN_CODE=0 for CMDARG in "php %{phpunit}" php74 php80 php81 php82; do if which $CMDARG; then set $CMDARG - $1 ${2:-%{_bindir}/phpunit9} --verbose || RETURN_CODE=1 + $1 ${2:-%{_bindir}/phpunit9} \ + --bootstrap bs.php \ + --verbose || RETURN_CODE=1 fi done exit $RETURN_CODE @@ -159,6 +165,12 @@ exit $RETURN_CODE %changelog +* Tue Sep 27 2022 Remi Collet <remi@remirepo.net> - 3.4.1-1 +- update to 3.4.1 + +* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 3.4.0-1 +- update to 3.4.0 + * Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 3.3.1-1 - update to 3.3.1 |