commit 36f31f49bfda061995977c057826fb9271da83a9
Author: Elan Ruusamäe <[email protected]>
Date: Fri Mar 31 11:46:45 2017 +0300
do not load composer autoloader
load only predictable autoloader, as versions installed via composer
could be incompatible than the version php-cs-fixer requires
autoload.patch | 21 +++++++++++++--------
php-cs-fixer.spec | 2 +-
2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 3a1a64c..661eba0 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -7,7 +7,7 @@
Summary: PHP Coding Standards Fixer
Name: php-cs-fixer
Version: 1.11.8
-Release: 1
+Release: 2
License: MIT
Group: Development/Languages/PHP
Source0:
https://github.com/FriendsOfPHP/PHP-CS-Fixer/archive/v%{version}/%{name}-%{version}.tar.gz
diff --git a/autoload.patch b/autoload.patch
index 75c5f92..61d2358 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,17 +1,22 @@
---- PHP-CS-Fixer-1.11.1/php-cs-fixer~ 2016-01-20 21:00:28.000000000 +0200
-+++ PHP-CS-Fixer-1.11.1/php-cs-fixer 2016-02-06 15:15:10.656768547 +0200
+--- PHP-CS-Fixer-1.11.1/php-cs-fixer 2016-02-06 15:15:10.656768547 +0200
++++ PHP-CS-Fixer-1.11.8/php-cs-fixer 2017-03-31 11:46:00.945798390 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/env php
+#!/usr/bin/php
<?php
/*
-@@ -35,7 +35,7 @@
- if (file_exists($a = __DIR__.'/../../autoload.php')) {
- require_once $a;
- } else {
+@@ -31,12 +31,7 @@
+ }
+ });
+
+-// installed via composer?
+-if (file_exists($a = __DIR__.'/../../autoload.php')) {
+- require_once $a;
+-} else {
- require_once __DIR__.'/vendor/autoload.php';
-+ require '/usr/share/php/Symfony/CS/autoload.php';
- }
+-}
++require '/usr/share/php/Symfony/CS/autoload.php';
use Symfony\CS\Console\Application;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-cs-fixer.git/commitdiff/36f31f49bfda061995977c057826fb9271da83a9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
