summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json74
-rw-r--r--php-mockery.spec23
2 files changed, 55 insertions, 42 deletions
diff --git a/composer.json b/composer.json
index bc6b77b..5870ef6 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
"name": "mockery/mockery",
"description": "Mockery is a simple yet flexible PHP mock object framework",
"license": "BSD-3-Clause",
+ "type": "library",
"keywords": [
"bdd",
"library",
@@ -18,39 +19,55 @@
{
"name": "Pádraic Brady",
"email": "padraic.brady@gmail.com",
- "homepage": "http://blog.astrumfutura.com"
+ "homepage": "https://github.com/padraic",
+ "role": "Author"
},
{
"name": "Dave Marshall",
"email": "dave.marshall@atstsolutions.co.uk",
- "homepage": "http://davedevelopment.co.uk"
+ "homepage": "https://davedevelopment.co.uk",
+ "role": "Developer"
+ },
+ {
+ "name": "Nathanael Esayeas",
+ "email": "nathanael.esayeas@protonmail.com",
+ "homepage": "https://github.com/ghostwriter",
+ "role": "Lead Developer"
}
],
"homepage": "https://github.com/mockery/mockery",
+ "support": {
+ "issues": "https://github.com/mockery/mockery/issues",
+ "source": "https://github.com/mockery/mockery",
+ "docs": "https://docs.mockery.io/",
+ "rss": "https://github.com/mockery/mockery/releases.atom",
+ "security": "https://github.com/mockery/mockery/security/advisories"
+ },
"require": {
- "php": "^7.4 || ^8.0",
+ "php": ">=7.4,<8.3",
"lib-pcre": ">=7.0",
"hamcrest/hamcrest-php": "^2.0.1"
},
"require-dev": {
"phpunit/phpunit": "^8.5 || ^9.3",
- "psalm/plugin-phpunit": "^0.18",
- "vimeo/psalm": "^5.9"
+ "psalm/plugin-phpunit": "^0.18.4",
+ "vimeo/psalm": "^5.13.1"
},
"conflict": {
"phpunit/phpunit": "<8.0"
},
"autoload": {
"psr-4": {
- "Mockery\\": "library/Mockery"
+ "Mockery\\": "src/Mockery"
},
"files": [
- "library/helpers.php",
- "library/Mockery.php"
+ "src/helpers.php",
+ "src/Mockery.php"
]
},
"autoload-dev": {
"psr-4": {
+ "Fixture\\": "tests/Fixture/",
"test\\": "tests/"
},
"files": [
@@ -58,40 +75,33 @@
]
},
"config": {
- "preferred-install": "dist"
- },
- "extra": {
- "branch-alias": {
- "dev-main": "1.6.x-dev"
- }
+ "optimize-autoloader": true,
+ "platform": {
+ "php": "7.4.999"
+ },
+ "preferred-install": "dist",
+ "sort-packages": true
},
"scripts": {
"check": [
"@composer validate",
- "@test",
- "@psalm:security",
- "@psalm:dry-run"
- ],
- "docs": "phpdoc -d library -t docs/api",
- "phpunit": [
- "@xdebug",
- "vendor/bin/phpunit --colors=always --testdox --stop-on-failure"
+ "@test"
],
+ "docs": "vendor/bin/phpdoc -d src -t docs/api",
+ "phpunit": "vendor/bin/phpunit --colors=always --testdox --stop-on-failure",
+ "phpunit:coverage": "vendor/bin/phpunit --colors=always --testdox --stop-on-failure --coverage-clover=coverage.xml",
"psalm": [
- "@xdebug",
- "@psalm:shepherd"
+ "@psalm:shepherd",
+ "@psalm:security",
+ "@psalm:dry-run"
],
- "psalm:baseline": "vendor/bin/psalm --set-baseline=psalm-baseline.xml",
- "psalm:dry-run": "vendor/bin/psalm --alter --issues=all --dry-run",
- "psalm:missing": "vendor/bin/psalm --alter --issues=MissingReturnType",
- "psalm:security": "vendor/bin/psalm --taint-analysis",
- "psalm:shepherd": "vendor/bin/psalm --shepherd --show-info=false --stats --no-diff --no-cache",
+ "psalm:baseline": "vendor/bin/psalm --no-diff --no-cache --set-baseline=psalm-baseline.xml",
+ "psalm:dry-run": "vendor/bin/psalm --no-cache --alter --issues=all --dry-run",
+ "psalm:security": "vendor/bin/psalm --no-diff --no-cache --taint-analysis",
+ "psalm:shepherd": "vendor/bin/psalm --no-diff --no-cache --shepherd --stats --output-format=github",
"test": [
"@phpunit",
"@psalm"
- ],
- "xdebug": [
- "@putenv XDEBUG_MODE=coverage"
]
}
}
diff --git a/php-mockery.spec b/php-mockery.spec
index e201e6b..7b5d369 100644
--- a/php-mockery.spec
+++ b/php-mockery.spec
@@ -9,7 +9,7 @@
#
%bcond_without tests
-%global gh_commit 13a7fa2642c76c58fa2806ef7f565344c817a191
+%global gh_commit b1be135c1ba7632f0248e07ee5e6e412576a309d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner mockery
%global gh_project mockery
@@ -17,7 +17,7 @@
%global major 1
Name: php-mockery
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
Summary: Mockery is a simple but flexible PHP mock object framework
@@ -34,8 +34,8 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.4
# From composer.json, "require-dev": {
# "phpunit/phpunit": "^8.5|^9.3",
-# "psalm/plugin-phpunit": "^0.18",
-# "vimeo/psalm": "^5.9"
+# "psalm/plugin-phpunit": "^0.18.4",
+# "vimeo/psalm": "^5.13.1"
%global phpunit %{_bindir}/phpunit9
BuildRequires: phpunit9 >= 9.3
# remirepo:1
@@ -51,7 +51,7 @@ BuildRequires: php-pdo
BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require": {
-# "php": "^7.4 || ^8.0",
+# "php": ">=7.4,<8.3",
# "lib-pcre": ">=7.0",
# "hamcrest/hamcrest-php": "~2.0"
Requires: php(language) >= 7.3
@@ -83,10 +83,10 @@ Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-mv library/*.php library/%{ns_project}/
-phpab --template fedora --output library/%{ns_project}/autoload.php library
+mv src/*.php src/%{ns_project}/
+phpab --template fedora --output src/%{ns_project}/autoload.php src
-cat << 'EOF' | tee -a library/%{ns_project}/autoload.php
+cat << 'EOF' | tee -a src/%{ns_project}/autoload.php
\Fedora\Autoloader\Dependencies::required([
'/usr/share/php/Hamcrest2/autoload.php',
@@ -105,7 +105,7 @@ rm -f docs/.gitignore
%install
mkdir -p %{buildroot}/%{_datadir}/php
-cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major}
+cp -rp src/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major}
%check
@@ -113,7 +113,7 @@ cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major}
: Use installed tree and our autoloader
export COMPOSER_VENDOR_DIR=%{buildroot}%{_datadir}/php/%{ns_project}%{major}
-phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery
+phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery tests/Fixture
: Run upstream test suite
ret=0
@@ -142,6 +142,9 @@ exit $ret
%changelog
+* Wed Jul 19 2023 Remi Collet <remi@remirepo.net> - 1.6.3-1
+- update to 1.6.3
+
* Thu Jun 8 2023 Remi Collet <remi@remirepo.net> - 1.6.2-1
- update to 1.6.2