diff --git a/.gitignore b/.gitignore index b34252a..46ac36a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -clog -/php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz -/php-webmozart-assert-1.12.0-541057574806f942c94662b817a50f63f7345360.tar.gz -/php-webmozart-assert-1.12.1-9be6926d8b485f55b9229203f962b51ed377ba68.tar.gz +/php-webmozart-assert-1.1.0-bb2d123231c095735130cc8f6d31385a44c7b308.tar.gz diff --git a/composer.json b/composer.json deleted file mode 100644 index b340452..0000000 --- a/composer.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "webmozart/assert", - "description": "Assertions to validate method input/output with nice error messages.", - "license": "MIT", - "keywords": [ - "assert", - "check", - "validate" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "require": { - "php": "^7.2 || ^8.0", - "ext-ctype": "*" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "Webmozart\\Assert\\Tests\\": "tests/", - "Webmozart\\Assert\\Bin\\": "bin/src" - } - }, - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - } -} diff --git a/php-webmozart-assert-get-source.sh b/php-webmozart-assert-get-source.sh deleted file mode 100755 index b2ac62b..0000000 --- a/php-webmozart-assert-get-source.sh +++ /dev/null @@ -1,73 +0,0 @@ -#/bin/sh - -GIT=`which git` -RPM=`which rpm` - -if [ -z "$GIT" ] -then - echo "ERROR: 'git' command not found" 1>&2 - exit 1 -elif [ -z "$RPM" ] -then - echo "ERROR: 'rpm' command not found" 1>&2 - exit 1 -fi - -function print { - echo -e "\e[0;33m>>>>> ${1}\e[0m" -} - -if [ -x "$1" ] -then - SPEC=$1 -else - SPEC=`ls *.spec | head -1` -fi - -SPEC_DIR=`pwd` - -print "SPEC_DIR = $SPEC_DIR" - -NAME=`echo $SPEC | sed 's#\.spec##'` -VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'` - -print "SPEC = $SPEC" -print "NAME = $NAME" - -GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'` -GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'` -GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'` -GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME} -GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'` - -print "GIT_OWNER = $GIT_OWNER" -print "GIT_NAME = $GIT_NAME" -print "GIT_COMMIT = $GIT_COMMIT" -print "GIT_REPO = $GIT_REPO" -print "GIT_DIR = $GIT_DIR" - -TEMP_DIR=$(mktemp --dir) - -pushd $TEMP_DIR - print "Cloning git repo..." - $GIT clone $GIT_REPO - - pushd $GIT_DIR - print "Checking out commit..." - $GIT checkout $GIT_COMMIT - popd - - TAR_DIR=${GIT_NAME}-${GIT_COMMIT} - print "TAR_DIR = $TAR_DIR" - - mv $GIT_DIR $TAR_DIR - - TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz - print "TAR_FILE = $TAR_FILE" - - [ -e $TAR_FILE ] && rm -f $TAR_FILE - tar --exclude-vcs -czf $TAR_FILE $TAR_DIR - chmod 0644 $TAR_FILE -popd - -rm -rf $TEMP_DIR diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 0616422..5f97c4a 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016-2025 Shawn Iwinski +# Copyright (c) 2016 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -9,30 +9,19 @@ # Please preserve changelog entries # -# enable bootstrap when need to provide a new autoloader -%global bootstrap 0 %global github_owner webmozart %global github_name assert -%global github_version 1.12.1 -%global github_commit 9be6926d8b485f55b9229203f962b51ed377ba68 +%global github_version 1.1.0 +%global github_commit bb2d123231c095735130cc8f6d31385a44c7b308 %global composer_vendor webmozart %global composer_project assert -# "php": "^7.2 || ^8.0" -%global php_min_ver 7.2 +# "php": "^5.3.3|^7.0" +%global php_min_ver 5.3.3 -# PHPUnit -%global phpunit_require phpunit8 -%global phpunit_exec phpunit8 - -%if %{bootstrap} -# Build using "--with tests" to enable tests -%global with_tests 0%{?_with_tests:1} -%else # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} -%endif %{!?phpdir: %global phpdir %{_datadir}/php} @@ -41,35 +30,35 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages +Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} - -# GitHub export does not include tests. -# Run php-webmozart-assert-get-source.sh to create full source. -Source0: %{name}-%{github_version}-%{github_commit}.tar.gz -Source1: %{name}-get-source.sh +Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz BuildArch: noarch # Tests %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(phpunit/phpunit) +## phpcompatinfo (computed from version 1.1.0) BuildRequires: php-ctype -BuildRequires: %{phpunit_require} -## phpcompatinfo (computed from version 1.7.0) BuildRequires: php-mbstring -BuildRequires: php-simplexml +BuildRequires: php-pcre +BuildRequires: php-spl ## Autoloader -BuildRequires: php-composer(fedora/autoloader) +BuildRequires: php-composer(symfony/class-loader) %endif # composer.json Requires: php(language) >= %{php_min_ver} +# phpcompatinfo (computed from version 1.1.0) Requires: php-ctype -# phpcompatinfo (computed from version 1.7.0) Requires: php-mbstring +Requires: php-pcre +Requires: php-spl # Autoloader -Requires: php-composer(fedora/autoloader) +Requires: php-composer(symfony/class-loader) # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -95,46 +84,42 @@ cat <<'AUTOLOAD' | tee src/autoload.php register(); +} + +$fedoraClassLoader->addPrefix('Webmozart\\Assert\\', dirname(dirname(__DIR__))); + +return $fedoraClassLoader; AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/Webmozart -cp -rp src %{buildroot}%{phpdir}/Webmozart/Assert +mkdir -p %{buildroot}%{phpdir}/Webmozart/Assert +cp -rp src/* %{buildroot}%{phpdir}/Webmozart/Assert/ %check %if %{with_tests} -: Create tests bootstrap -cat <<'BOOTSTRAP' | tee bootstrap.php - - 1.12.1-1 -- update to 1.12.1 (no change) - -* Tue Oct 21 2025 Remi Collet - 1.12.0-1 -- update to 1.12.0 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.11.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.11.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.11.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.11.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.11.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Aug 8 2022 Remi Collet - 1.11.0-1 -- update to 1.11.0 -- raise dependency on PHP 7.2 -- switch to phpunit8 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Sep 24 2021 Remi Collet - 1.10.0-1 -- update to 1.10.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 21 2020 Remi Collet - 1.9.1-1 -- update to 1.9.1 (RHBZ #1825544) - -* Sun Feb 23 2020 Shawn Iwinski - 1.7.0-1 -- Update to 1.7.0 (RHBZ #1746998) -- Disable bootstrap so tests run by default -- Conditionally use PHPUnit 7 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun May 19 2019 Shawn Iwinski - 1.4.0-1 -- Update to 1.4.0 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 19 2018 Remi Collet - 1.3.0-3 -- fix autoloader, use PSR-4 to avoid duplicated definition -- prepend autoloader to ensure we use current version in tests -- fix FTBFS #1605449 - -* Fri Oct 19 2018 Remi Collet - 1.3.0-2 -- fix autoloader, use PSR-4 to avoid duplicated definition -- prepend autoloader to ensure we use current version in tests -- fix FTBFS #1605449 -- bootstrap build - -* Fri Jul 13 2018 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Apr 22 2018 Shawn Iwinski - 1.3.0-1 -- Update to 1.3.0 (RHBZ #1539946) -- Add get source script -- Add composer.json to repo -- Update running of tests - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Dec 27 2016 Shawn Iwinski - 1.2.0-1 -- Update to 1.2.0 (RHBZ #1398043) -- Use php-composer(fedora/autoloader) -- Run upstream tests with SCLs if they are available - * Wed Sep 28 2016 Shawn Iwinski - 1.1.0-1 - Initial package diff --git a/sources b/sources index dc7d3b2..155cec1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.12.1-9be6926d8b485f55b9229203f962b51ed377ba68.tar.gz) = 1d8732643dd50272fbce65adee8fb6511f034021ad9d14e40d437dbb181368934cf4f5f552ae41e4e48a99cd23d570070d00d64a7702eefb578e1cbd38253edc +930de37e6ee811ec9a84fa5ede20d3a4 php-webmozart-assert-1.1.0-bb2d123231c095735130cc8f6d31385a44c7b308.tar.gz