summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-05 08:36:55 +0200
committerRemi Collet <remi@remirepo.net>2017-05-05 08:36:55 +0200
commit838ee2ccade3a65178d40a8655c44c4c82966fa2 (patch)
tree13339c7f684d921238b5ede0a67bd10f300c4d68
parentac1e0b5887aa5719a13639352e65c18645dc87b8 (diff)
backport
-rw-r--r--.gitignore7
-rw-r--r--Makefile4
-rw-r--r--composer.json27
-rw-r--r--php-phpdocumentor-type-resolver.spec3
4 files changed, 40 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..13af741
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../../common/Makefile
+
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..abaa965
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+ "name": "phpdocumentor/type-resolver",
+ "type": "library",
+ "license": "MIT",
+ "authors": [
+ {"name": "Mike van Riel", "email": "me@mikevanriel.com"}
+ ],
+ "require": {
+ "php": ">=5.5",
+ "phpdocumentor/reflection-common": "^1.0"
+ },
+ "autoload": {
+ "psr-4": {"phpDocumentor\\Reflection\\": ["src/"]}
+ },
+ "autoload-dev": {
+ "psr-4": {"phpDocumentor\\Reflection\\": ["tests/unit"]}
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.2||^4.8.24",
+ "mockery/mockery": "^0.9.4"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ }
+}
diff --git a/php-phpdocumentor-type-resolver.spec b/php-phpdocumentor-type-resolver.spec
index 1c78e37..e1cd9f7 100644
--- a/php-phpdocumentor-type-resolver.spec
+++ b/php-phpdocumentor-type-resolver.spec
@@ -1,3 +1,4 @@
+# remirepo spec file for php-phpdocumentor-type-resolver, from
#
# Fedora spec file for php-phpdocumentor-type-resolver
#
@@ -134,7 +135,7 @@ sed 's#vendor/mockery/mockery/library#%{phpdir}#' phpunit.xml.dist > phpunit.xml
: Upstream tests
RETURN_CODE=0
-for PHP_EXEC in php php56 php70 php71; do
+for PHP_EXEC in php php56 php70 php71 php72; do
if which $PHP_EXEC; then
$PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || RETURN_CODE=1
fi