summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json9
-rw-r--r--php-doctrine-persistence.spec28
2 files changed, 23 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index 7eb9d7f..10704f1 100644
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,8 @@
"doctrine/reflection": "^1.0"
},
"require-dev": {
- "phpstan/phpstan": "^0.8",
- "doctrine/coding-standard": "^5.0",
+ "phpstan/phpstan": "^0.11",
+ "doctrine/coding-standard": "^6.0",
"phpunit/phpunit": "^7.0"
},
"conflict": {
@@ -37,7 +37,8 @@
},
"autoload": {
"psr-4": {
- "Doctrine\\Common\\": "lib/Doctrine/Common"
+ "Doctrine\\Common\\": "lib/Doctrine/Common",
+ "Doctrine\\Persistence\\": "lib/Doctrine/Persistence"
}
},
"autoload-dev": {
@@ -47,7 +48,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
}
}
diff --git a/php-doctrine-persistence.spec b/php-doctrine-persistence.spec
index e7c2216..7492924 100644
--- a/php-doctrine-persistence.spec
+++ b/php-doctrine-persistence.spec
@@ -8,7 +8,7 @@
#
%global bootstrap 0
-%global gh_commit 43526ae63312942e5316100bb3ed589ba1aba491
+%global gh_commit fb81d2bccc0b891393367c8bb1fcc4cf8efcc761
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner doctrine
%global gh_project persistence
@@ -26,7 +26,7 @@
%endif
Name: php-%{pk_vendor}-%{pk_project}
-Version: 1.2.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Doctrine Persistence abstractions
@@ -43,8 +43,8 @@ BuildRequires: php-reflection
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json
-# "phpstan/phpstan": "^0.8",
-# "doctrine/coding-standard": "^5.0",
+# "phpstan/phpstan": "^0.11",
+# "doctrine/coding-standard": "^6.0",
# "phpunit/phpunit": "^7.0"
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -114,7 +114,7 @@ Conflicts: php-doctrine-common < 1:2.10
The Doctrine Persistence project is a set of shared interfaces and
functionality that the different Doctrine object mappers share.
-Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php
+Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_subproj}/autoload.php
%prep
@@ -124,10 +124,10 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.ph
%build
: Generate a simple autoloader
%{_bindir}/phpab \
- --output lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php \
+ --output lib/%{ns_vendor}/%{ns_subproj}/autoload.php \
--template fedora \
- lib/%{ns_vendor}/%{ns_project}
-cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php
+ lib/%{ns_vendor}
+cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_subproj}/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
@@ -141,8 +141,10 @@ EOF
%install
-mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor}
-cp -pr lib/%{ns_vendor}/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
+mkdir -p %{buildroot}%{_datadir}/php
+cp -pr lib/%{ns_vendor} %{buildroot}%{_datadir}/php/%{ns_vendor}
+ln -s ../../%{ns_subproj}/autoload.php \
+ %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php
%check
@@ -182,9 +184,15 @@ exit $ret
%doc *.md
%doc composer.json
%{_datadir}/php/%{ns_vendor}/%{ns_project}/*
+%{_datadir}/php/%{ns_vendor}/%{ns_subproj}
%changelog
+* Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 1.3.1-1
+- update to 1.3.1
+- use new namespace Doctrine\Persistence
+ and provide compatibility Doctrine\Common\Persistence
+
* Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1
- update to 1.2.0