summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-10-02 16:14:23 +0200
committerRemi Collet <remi@remirepo.net>2017-10-02 16:14:23 +0200
commite7c64fc775ccb53291f4cc0dd77e9255970abc34 (patch)
tree8e19d5caf359c735f01cb6893ed56840fd4c7bdd
parent497ad880d96b5264464962773bdd75fc02d8a16a (diff)
v2.6.1
-rw-r--r--composer.json9
-rw-r--r--php-cs-fixer-autoload.patch34
-rw-r--r--php-cs-fixer.spec9
3 files changed, 28 insertions, 24 deletions
diff --git a/composer.json b/composer.json
index e3d1045..340b3ca 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
}
],
"require": {
- "php": "^5.6 || >=7.0 <7.2",
+ "php": "^5.6 || >=7.0 <7.3",
"ext-json": "*",
"ext-tokenizer": "*",
"composer/semver": "^1.4",
@@ -63,10 +63,5 @@
"autoload-dev": {
"psr-4": { "PhpCsFixer\\Tests\\": "tests/" }
},
- "bin": ["php-cs-fixer"],
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- }
+ "bin": ["php-cs-fixer"]
}
diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch
index 549be98..6e8261b 100644
--- a/php-cs-fixer-autoload.patch
+++ b/php-cs-fixer-autoload.patch
@@ -1,24 +1,30 @@
diff -up ./php-cs-fixer.rpm ./php-cs-fixer
---- ./php-cs-fixer.rpm 2017-08-03 11:05:45.000000000 +0200
-+++ ./php-cs-fixer 2017-08-03 11:52:15.526145624 +0200
-@@ -40,12 +40,7 @@ set_error_handler(function ($severity, $
+--- ./php-cs-fixer.rpm 2017-10-02 16:04:28.744937463 +0200
++++ ./php-cs-fixer 2017-10-02 16:04:55.577092013 +0200
+@@ -39,18 +39,7 @@ set_error_handler(function ($severity, $
}
});
--// installed via composer?
--if (file_exists($a = __DIR__.'/../../autoload.php')) {
-- require_once $a;
--} else {
-- require_once __DIR__.'/vendor/autoload.php';
+-try {
+- // Maybe this file is used as phar-stub? Let's try!
+- Phar::mapPhar('php-cs-fixer.phar');
+- require_once 'phar://php-cs-fixer.phar/vendor/autoload.php';
+-} catch (PharException $e) {
+- // OK, it's not, let give Composer autoloader a try!
+- if (file_exists($a = __DIR__.'/../../autoload.php')) {
+- require_once $a;
+- } else {
+- require_once __DIR__.'/vendor/autoload.php';
+- }
-}
+require_once '/usr/share/php/PhpCsFixer/autoload.php';
use PhpCsFixer\Console\Application;
diff -up ./src/Console/Command/HelpCommand.php.rpm ./src/Console/Command/HelpCommand.php
---- ./src/Console/Command/HelpCommand.php.rpm 2017-08-03 11:05:45.000000000 +0200
-+++ ./src/Console/Command/HelpCommand.php 2017-08-03 11:52:15.526145624 +0200
-@@ -343,6 +343,8 @@ EOF
+--- ./src/Console/Command/HelpCommand.php.rpm 2017-10-02 16:03:56.000000000 +0200
++++ ./src/Console/Command/HelpCommand.php 2017-10-02 16:04:28.744937463 +0200
+@@ -345,6 +345,8 @@ EOF
{
static $version = null;
@@ -28,9 +34,9 @@ diff -up ./src/Console/Command/HelpCommand.php.rpm ./src/Console/Command/HelpCom
return $version;
}
diff -up ./tests/AutoReview/ProjectCodeTest.php.rpm ./tests/AutoReview/ProjectCodeTest.php
---- ./tests/AutoReview/ProjectCodeTest.php.rpm 2017-08-03 11:05:45.000000000 +0200
-+++ ./tests/AutoReview/ProjectCodeTest.php 2017-08-03 11:52:47.461317357 +0200
-@@ -310,8 +310,10 @@ final class ProjectCodeTest extends Test
+--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2017-10-02 16:03:56.000000000 +0200
++++ ./tests/AutoReview/ProjectCodeTest.php 2017-10-02 16:04:28.745937469 +0200
+@@ -383,8 +383,10 @@ final class ProjectCodeTest extends Test
->files()
->name('*.php')
->in(__DIR__.'/../../src')
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 5dcbf35..c0d6ef9 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 5642a36a60c11cdd01488d192541a89bb44a4abf
+%global gh_commit a0484335b26a05b4353f7a0691a887b7a3706fe5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150717
%global gh_owner FriendsOfPHP
@@ -15,7 +15,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-cs-fixer
-Version: 2.6.0
+Version: 2.6.1
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A tool to automatically fix PHP code style
@@ -92,7 +92,7 @@ BuildRequires: php-fedora-autoloader-devel
%endif
# From composer.json, "require": {
-# "php": "^5.6 || >=7.0 <7.2",
+# "php": "^5.6 || >=7.0 <7.3",
# "ext-json": "*",
# "ext-tokenizer": "*",
# "composer/semver": "^1.4",
@@ -273,6 +273,9 @@ exit $ret
%changelog
+* Mon Oct 2 2017 Remi Collet <remi@remirepo.net> - 2.6.1-1
+- Update to 2.6.1
+
* Tue Sep 12 2017 Remi Collet <remi@remirepo.net> - 2.6.0-1
- Update to 2.6.0
- add dependency on composer/semver