[packages/php-pear-PHP_CodeSniffer] up to 2.0.0

[glen]

commit 0c80f75fa0865713906acde33d06a959e281163f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Dec 18 15:40:52 2014 +0200

    up to 2.0.0

 case-sensitive.patch          | 12 ++++++------
 peardeps.patch                | 39 ++++++++++++++++++++++++++-------------
 php-pear-PHP_CodeSniffer.spec |  9 +++------
 3 files changed, 35 insertions(+), 25 deletions(-)
---
diff --git a/php-pear-PHP_CodeSniffer.spec b/php-pear-PHP_CodeSniffer.spec
index b550f95..02e1cf1 100644
--- a/php-pear-PHP_CodeSniffer.spec
+++ b/php-pear-PHP_CodeSniffer.spec
@@ -9,13 +9,13 @@
 Summary:	PHP_CodeSniffer tokenises PHP code and detects violations of a defined set of coding standards
 Summary(pl.UTF-8):	PHP_CodeSniffer analizuje kod PHP pod kątem naruszeń zdefiniowanych standardów kodowania
 Name:		php-pear-%{pearname}
-Version:	1.5.6
+Version:	2.0.0
 Release:	1
 Epoch:		1
 License:	BSD License
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{pearname}-%{version}.tgz
-# Source0-md5:	baa6e8ff2d077db02b9325bf608ade43
+# Source0-md5:	92df2d7f59824ab07404a26cbd6ef853
 Patch0:		case-sensitive.patch
 Patch1:		peardeps.patch
 URL:		http://pear.php.net/package/PHP_CodeSniffer/
@@ -71,12 +71,9 @@ install -p .%{_bindir}/phpcs $RPM_BUILD_ROOT%{_bindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p <lua>
-%pear_package_print_optionalpackages
-
 %files
 %defattr(644,root,root,755)
-%doc install.log optional-packages.txt
+%doc install.log
 %{php_pear_dir}/.registry/*.reg
 %attr(755,root,root) %{_bindir}/phpcs
 %{php_pear_dir}/PHP/CodeSniffer
diff --git a/case-sensitive.patch b/case-sensitive.patch
index 4f1b1dd..967a479 100644
--- a/case-sensitive.patch
+++ b/case-sensitive.patch
@@ -1,11 +1,11 @@
---- PHP_CodeSniffer-1.4.3/usr/share/pear/PHP/CodeSniffer.php~	2012-12-19 21:54:32.000000000 +0200
-+++ PHP_CodeSniffer-1.4.3/usr/share/pear/PHP/CodeSniffer.php	2012-12-19 21:56:17.677485504 +0200
-@@ -1240,7 +1240,7 @@
+--- PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer.php~	2014-12-18 15:30:31.000000000 +0200
++++ PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer.php	2014-12-18 15:31:17.858092309 +0200
+@@ -1559,7 +1559,7 @@
                  $testPath = $path;
              }
  
--            if (preg_match("|{$pattern}|i", $testPath) === 1) {
-+            if (preg_match("|{$pattern}|", $testPath) === 1) {
+-            $pattern = '`'.$pattern.'`i';
++            $pattern = '`'.$pattern.'`';
+             if (preg_match($pattern, $testPath) === 1) {
                  return true;
              }
-         }//end foreach
diff --git a/peardeps.patch b/peardeps.patch
index 7a7afb5..489143f 100644
--- a/peardeps.patch
+++ b/peardeps.patch
@@ -13,18 +13,31 @@
  
  /**
   * A class to process command line phpcs scripts.
---- PHP_CodeSniffer-1.4.0/./usr/share/pear/PHP/CodeSniffer/Reporting.php~	2012-10-17 23:08:34.000000000 +0300
-+++ PHP_CodeSniffer-1.4.0/./usr/share/pear/PHP/CodeSniffer/Reporting.php	2012-10-17 23:09:49.330982079 +0300
-@@ -14,11 +14,7 @@
-  * @link      http://pear.php.net/package/PHP_CodeSniffer
-  */
+--- PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer/CLI.php~	2014-12-18 15:33:47.000000000 +0200
++++ PHP_CodeSniffer-2.0.0/usr/share/pear/PHP/CodeSniffer/CLI.php	2014-12-18 15:35:53.698306987 +0200
+@@ -80,11 +80,7 @@
+             define('PHP_CODESNIFFER_CBF', false);
+         }
  
--if (is_file(dirname(__FILE__).'/../CodeSniffer.php') === true) {
--    include_once dirname(__FILE__).'/../CodeSniffer.php';
--} else {
--    include_once 'PHP/CodeSniffer.php';
--}
-+include_once 'PHP/CodeSniffer.php';
+-        if (is_file(dirname(__FILE__).'/../CodeSniffer/Reporting.php') === true) {
+-            include_once dirname(__FILE__).'/../CodeSniffer/Reporting.php';
+-        } else {
+-            include_once 'PHP/CodeSniffer/Reporting.php';
+-        }
++        include_once 'PHP/CodeSniffer/Reporting.php';
  
- /**
-  * A class to manage reporting.
+         PHP_CodeSniffer_Reporting::startTiming();
+         $this->checkRequirements();
+@@ -105,11 +105,7 @@
+             define('PHP_CODESNIFFER_CBF', true);
+         }
+ 
+-        if (is_file(dirname(__FILE__).'/../CodeSniffer/Reporting.php') === true) {
+-            include_once dirname(__FILE__).'/../CodeSniffer/Reporting.php';
+-        } else {
+-            include_once 'PHP/CodeSniffer/Reporting.php';
+-        }
++		include_once 'PHP/CodeSniffer/Reporting.php';
+ 
+         PHP_CodeSniffer_Reporting::startTiming();
+         $this->checkRequirements();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pear-PHP_CodeSniffer.git/commitdiff/ede67b34a3484f491b18d6335734a96b83b9ec2d