diff --git a/.gitignore b/.gitignore index 29e0a79..c5a550a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ php-markdown-1.0.1n.zip /php-markdown-1.8.0-01ab082.tgz /php-markdown-1.9.0-c83178d.tgz /php-markdown-1.9.1-5024d62.tgz +/php-markdown-2.0.0.tar.gz diff --git a/composer.json b/composer.json index 0935075..7cb59cf 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,37 @@ } ], "require": { - "php": ">=5.3.0" + "php": ">=7.4" }, "autoload": { "psr-4": { "Michelf\\": "Michelf/" } }, "require-dev": { - "phpunit/phpunit": ">=4.3 <5.8" + "friendsofphp/php-cs-fixer": "^3.0", + "phpunit/phpunit": "^9.5", + "phpstan/phpstan": ">=1.0", + "phpstan/phpstan-phpunit": ">=1.0" + }, + + "scripts": { + "tests": "vendor/bin/phpunit test/", + "phpstan": [ + "vendor/bin/phpstan analyse Michelf/ --level=5", + "vendor/bin/phpstan analyse -c test/phpstan.neon test/ --level=5" + ], + "codestyle": "vendor/bin/php-cs-fixer fix Michelf --dry-run --verbose --show-progress=none", + "codestyle-fix": "vendor/bin/php-cs-fixer fix Michelf" + }, + + "archive": { + "exclude": [ + "/.github/", + "/test/", + "/.editorconfig", + "/.gitignore", + "/.scrutinizer.yml", + "/.travis.yml", + "/phpunit.xml.dist" + ] } } diff --git a/php-markdown.spec b/php-markdown.spec index aff9273..2747bbc 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -11,13 +11,13 @@ %global gh_project php-markdown Name: php-markdown -Version: 1.9.1 -Release: 6%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause URL: https://michelf.ca/projects/php-markdown/ -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: https://github.com/michelf/php-markdown/archive/%{version}/%{name}-%{version}.tar.gz Source1: makesrc.sh BuildArch: noarch @@ -25,9 +25,9 @@ BuildRequires: php-fedora-autoloader-devel # For tests # "require-dev": { # "phpunit/phpunit": ">=4.3 <5.8" -BuildRequires: phpunit +BuildRequires: phpunit10 -Requires: php(language) >= 5.3 +Requires: php(language) >= 7.4 Requires: php-pcre Requires: php-composer(fedora/autoloader) @@ -45,7 +45,7 @@ Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q mv License.md LICENSE @@ -79,11 +79,11 @@ require "test/bootstrap.php"; EOF ret=0 -for php in php php74 php80 php81 +for php in php php74 php81 php82 php83 do if which $php then - $php %{_bindir}/phpunit --bootstrap bs.php || ret=1 + $php %{_bindir}/phpunit10 --bootstrap bs.php || ret=1 fi done exit $ret @@ -99,6 +99,9 @@ exit $ret %changelog +* Wed Oct 04 2023 Sérgio Basto - 2.0.0-1 +- Update php-markdown to 2.0.0 + * Fri Jul 21 2023 Fedora Release Engineering - 1.9.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index d1f7930..e26d3a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-markdown-1.9.1-5024d62.tgz) = e8a7e6e0a0c109a461abac6442b6fabbe9f3a53c7ed25dc64ed82e70e645971afc559353cd7f86202695571356aa791b7055161336cb54b5034125e4f3be27a2 +SHA512 (php-markdown-2.0.0.tar.gz) = a848bc7374f8392d21824acbc1fb11c37f961e1780fb2c735a4d4d09949fb51a6962d8d2f6df2dfca92d00a33da82062d5e2a8b8301cb476242e1fc17af673b5