Merge pull request #30 from jrfnl/feature/version-update

Update static sheets
jrfnl · Mar 23, 2017 · 23ac0b2 · 23ac0b2
2 parents 934ff73 + 307a262
commit 23ac0b2
Show file tree

Hide file tree

Showing 122 changed files with 396,876 additions and 757 deletions.
diff --git a/.htaccess b/.htaccess
@@ -78,8 +78,11 @@ RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.0(alpha1|RC
 # 7.0.2/6 => 7.0.4
 RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.[26]\.html$ http://phpcheatsheets.com/static_results/$1/php7.0.4.html
 
-# 7.0.8 => 7.0.10
-RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.8\.html$ http://phpcheatsheets.com/static_results/$1/php7.0.10.html
+# 7.0.8 => 7.0.12
+RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.8\.html$ http://phpcheatsheets.com/static_results/$1/php7.0.12.html
+
+# 7.0.10/13 => 7.0.12
+RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.1[03]\.html$ http://phpcheatsheets.com/static_results/$1/php7.0.12.html
 
 # 7.1.0alpha3 => 7.1.0
 RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.1\.0alpha3\.html$ http://phpcheatsheets.com/static_results/$1/php7.1.0.html

diff --git a/.travis.yml b/.travis.yml
@@ -19,35 +19,37 @@ matrix:
     # aliased to 5.3.29
     - php: '5.3'
       env: LTPHPFIVEFOUR=1
-    # aliased to a recent 5.4.x version
     - php: '5.4'
       env: GTEPHPFIVEFOUR=1
-    # aliased to a recent 5.5.x version
     - php: '5.5'
       env: GTEPHPFIVEFOUR=1 SNIFF=1
-    # aliased to a recent 5.6.x version
     - php: '5.6'
       env: GTEPHPFIVEFOUR=1
-    # aliased to a recent 7.x version
     - php: '7.0'
       env: GTEPHPFIVEFOUR=1
-    # aliased to a recent hhvm version
+    - php: '7.1'
+      env: GTEPHPFIVEFOUR=1
     - php: 'hhvm'
       env: GTEPHPFIVEFOUR=1
+    - php: 'nightly'
+      env: GTEPHPFIVEFOUR=1
 
   allow_failures:
     - php: 'hhvm'
-
+    - php: 'nightly'
 
 # Use this to prepare your build for testing.
 # Failures in this section will result in build status 'errored'.
-before_script:
+before_install:
     - export PHPCS_DIR=/tmp/phpcs
     - export WPCS_DIR=/tmp/wpcs
+    - export PHPCOMPAT_DIR=/tmp/wpcs/PHPCompatibility
     # Install CodeSniffer for WordPress Coding Standards checks.
     - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
     # Install WordPress Coding Standards.
     - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $WPCS_DIR; fi
+    # Install PHPCompatibility Standards in a subdirectory of WPCS so we only need to run installed_paths once.
+    - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git $PHPCOMPAT_DIR; fi
     # Hop into CodeSniffer directory.
     - if [[ "$SNIFF" == "1" ]]; then cd $PHPCS_DIR; fi
     # Set install path for WordPress Coding Standards.

diff --git a/README.md b/README.md
@@ -42,6 +42,11 @@ In general, a balance is sought between significance and variety.
 
 ### Changelog:
 
+#### 1.3.6 (March 23 2017)
+* Renewed static sheets:
+	- Added static sheets for PHP 7.1.3, 7.0.17, 7.0,12, 5.6.30
+	- Removed static sheet generation for PHP 7.0.13, 7.0.10.
+
 #### 1.3.5 (Dec 3 2016): PHP 7.1 has been released: new arithmetic exceptions
 * Renewed static sheets:
 	- Added static sheets for PHP 7.1.0, 7.0.13, 7.0.10, 5.6.28, 5.6.25, 5.5.38, 5.5.35.

diff --git a/bin/autogen-static-sheets.bat b/bin/autogen-static-sheets.bat
@@ -97,17 +97,17 @@ IF NOT EXIST "%_AUTOGEN_SCRIPT_LOCATION%" GOTO :AUTOGEN_SCRIPT_LOCATION_ERROR EL
 :: 4.4        4.4.9     4.4.9
 :: 5.0        5.0.5     5.0.4
 :: 5.1        5.1.6     5.1.6
-:: 5.2        5.2.17    5.2.17, 5.2.6, 5.2.10, 5.2.9
+:: 5.2        5.2.17    5.2.17, 5.2.6, 5.2.10
 :: 5.3        5.3.29    5.3.29, 5.3.3, 5.3.10, 5.3.28, 5.3.27 (v28 not included in run as 27 + 29 are)
-:: 5.4        5.4.45    5.4.45, 5.4.16, 5.4.41, 5.4.36, 5.4.39, 5.4.44, 5.4.4 (v44, v39 not included in run as 41 and 36 are)
-:: 5.5        5.5.38    5.5.9, 5.5.38, 5.5.30, 5.5.35, 5.5.37, 5.5.36 (v37 and v36 not included in run as 35 and 38 are)
-:: 5.6        5.6.28    5.6.27, 5.6.25, 5.6.28, 5.6.26, 5.6.24, 5.6.21, 5.6.23, 5.6.22, 5.6.16, 5.6.20 (...)
-:: 7.0        7.0.13    7.0.12, 7.0.13, 7.0.11, 7.0.10, 7.0.8, 7.0.6
-:: 7.1        7.1.0
+:: 5.4        5.4.45    5.4.45, 5.4.16, 5.4.41, 5.4.36, 5.4.39, 5.4.4 (v44, v39 not included in run as 41 and 36 are)
+:: 5.5        5.5.38    5.5.38, 5.5.9, 5.5.30, 5.5.35, 5.5.36 (v37 and v36 not included in run as 35 and 38 are)
+:: 5.6        5.6.30    5.6.30, 5.6.29, 5.6.28, 5.6.21, 5.6.27, 5.6.25, 5.6.24 (...)
+:: 7.0        7.0.17    7.0.16, 7.0.15, 7.0.14, 7.0.12, 7.0.6, 7.0.13
+:: 7.1        7.1.3     7.1.2, 7.1.1, 7.1.0
 ::
 :: Ubuntu LTS versions: 5.3.10 (U 12.04), 5.5.9 (U 14.04), 7.0.4 (U 16.04)
 :: Debian main releases: 5.3.3 (D 6), 5.4.4 (D 7), 5.6.7 (D 8)
-:: CentOS main releases: 5.1.6 (COS 5.11), 5.3.3 (COS 6.8), 5.4.16 (COS 7-1511)
+:: CentOS main releases: 5.1.6 (COS 5.11), 5.3.3 (COS 6.8), 5.4.16 (COS 7-1611)
 ::
 :: No longer included:
 :: Old versions where a release close to it is now more relevant. Redirecting old links to new via .htaccess.
@@ -149,16 +149,18 @@ IF NOT EXIST "%_AUTOGEN_SCRIPT_LOCATION%" GOTO :AUTOGEN_SCRIPT_LOCATION_ERROR EL
 :: 7.0.0RC6 => 7.0.0
 :: 7.0.2 => 7.0.4
 :: 7.0.6 => 7.0.4
-:: 7.0.8 => 7.0.10
+:: 7.0.8 => 7.0.12
+:: 7.0.10 => 7.0.12
+:: 7.0.13 => 7.0.12
 :: 7.1.0alpha3 => 7.1.0
 ::
 ::---------------------------------------------------------------------------------
 
 :: Run autogen for various PHP versions
 :RUN_AUTOGEN
-FOR %%G IN (7.1.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
-FOR %%G IN (7.0.13 7.0.10 7.0.4 7.0.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
-FOR %%G IN (5.6.28 5.6.25 5.6.20 5.6.16 5.6.7 5.6.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
+FOR %%G IN (7.1.3 7.1.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
+FOR %%G IN (7.0.17 7.0.12 7.0.4 7.0.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
+FOR %%G IN (5.6.30 5.6.28 5.6.25 5.6.20 5.6.16 5.6.7 5.6.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
 FOR %%G IN (5.5.38 5.5.35 5.5.30 5.5.22 5.5.16 5.5.9) DO CALL :RUN_AUTOGEN_PHP5 %%G
 FOR %%G IN (5.4.45 5.4.41 5.4.36 5.4.27 5.4.16 5.4.4) DO CALL :RUN_AUTOGEN_PHP5 %%G
 FOR %%G IN (5.3.29 5.3.27 5.3.10 5.3.3) DO CALL :RUN_AUTOGEN_PHP5 %%G

diff --git a/bin/autogen-static-sheets.php b/bin/autogen-static-sheets.php
@@ -11,7 +11,13 @@
 if ( extension_loaded( 'suhosin' ) && is_numeric( ini_get( 'suhosin.memory_limit' ) ) ) {
 	$limit = ini_get( 'memory_limit' );
 	if ( preg_match( '(^(\d+)([BKMGT]))', $limit, $match ) ) {
-		$shift = array( 'B' => 0, 'K' => 10, 'M' => 20, 'G' => 30, 'T' => 40 );
+		$shift = array(
+			'B' => 0,
+			'K' => 10,
+			'M' => 20,
+			'G' => 30,
+			'T' => 40,
+		);
 		$limit = ( $match[1] * ( 1 << $shift[ $match[2] ] ) );
 	}
 	if ( ini_get( 'suhosin.memory_limit' ) > $limit && $limit > -1 ) {
@@ -142,7 +148,7 @@ function fix_content( $content ) {
 		7  => '<th>array()<br />					</th>',
 		8  => 'array()<br />',
 		9  => '<t$1$2>array()<br /></t$1>',
-		10 => '<option value="live">PHP 5.6.23</option>', // IMPORTANT! Change this if the PHP version on the server changes!!
+		10 => '<option value="live">PHP 5.6.30</option>', // IMPORTANT! Change this if the PHP version on the server changes!!
 		12 => '<a href="http://$1/index.php?page=$2&amp;phpversion=php' . PHP_VERSION . '" class="top-link$3">',
 		13 => '[<a href="$1">$2</a>]',
 		14 => '<a href="$1"',

diff --git a/class.vartype-php5.php b/class.vartype-php5.php
@@ -268,7 +268,9 @@ public static function do_filter_var_array( $value, $filter = FILTER_DEFAULT, $f
 			pr_var( filter_var_array( $value, $filter ), '', true, true );
 		}
 		else {
-			$input      = array( 'x' => $value );
+			$input      = array(
+				'x' => $value,
+			);
 			$filter_def = array(
 				'x' => array(
 					'filter' => $filter,

diff --git a/include/vars-to-test.php b/include/vars-to-test.php
@@ -60,8 +60,17 @@
 	'sv'  => '0123', // Testing is_numeric, filter_var integer allow octal, integers.
 
 	'ae'  => array(),
-	'a3'  => array( 1 => 'string' ), // With different key -> array + array.
-	'a4'  => array( false, 1, 1.3, '123str', 'str123', null ),
+	'a3'  => array( // With different key -> array + array.
+		1 => 'string',
+	),
+	'a4'  => array(
+		false,
+		1,
+		1.3,
+		'123str',
+		'str123',
+		null,
+	),
 
 	'oe'  => new stdClass(),
 	'o2'  => new TestObjectToString(),

diff --git a/ror.xml b/ror.xml
@@ -621,6 +621,13 @@
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
+		<item>
+			<link>http://phpcheatsheets.com/static_results/arithmetic/php5.6.30.html</link>
+			<title>PHP Arithmetic Operations Cheatsheet for PHP 5.6.30</title>
+			<ror:updatePeriod>monthly</ror:updatePeriod>
+			<ror:sortOrder>4</ror:sortOrder>
+			<ror:resourceOf>sitemap</ror:resourceOf>
+		</item>
 		<item>
 			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.0.html</link>
 			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.0</title>
@@ -636,15 +643,15 @@
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.10.html</link>
-			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.10</title>
+			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.12.html</link>
+			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.12</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.13.html</link>
-			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.13</title>
+			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.17.html</link>
+			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.17</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
@@ -656,6 +663,13 @@
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
+		<item>
+			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.1.3.html</link>
+			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.1.3</title>
+			<ror:updatePeriod>monthly</ror:updatePeriod>
+			<ror:sortOrder>4</ror:sortOrder>
+			<ror:resourceOf>sitemap</ror:resourceOf>
+		</item>
 		<item>
 			<link>http://phpcheatsheets.com/static_results/compare/php4.3.11.html</link>
 			<title>PHP Variable Comparison Cheatsheet for PHP 4.3.11</title>
@@ -866,6 +880,13 @@
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
+		<item>
+			<link>http://phpcheatsheets.com/static_results/compare/php5.6.30.html</link>
+			<title>PHP Variable Comparison Cheatsheet for PHP 5.6.30</title>
+			<ror:updatePeriod>monthly</ror:updatePeriod>
+			<ror:sortOrder>4</ror:sortOrder>
+			<ror:resourceOf>sitemap</ror:resourceOf>
+		</item>
 		<item>
 			<link>http://phpcheatsheets.com/static_results/compare/php7.0.0.html</link>
 			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.0</title>
@@ -881,15 +902,15 @@
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/compare/php7.0.10.html</link>
-			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.10</title>
+			<link>http://phpcheatsheets.com/static_results/compare/php7.0.12.html</link>
+			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.12</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/compare/php7.0.13.html</link>
-			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.13</title>
+			<link>http://phpcheatsheets.com/static_results/compare/php7.0.17.html</link>
+			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.17</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
@@ -901,6 +922,13 @@
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
+		<item>
+			<link>http://phpcheatsheets.com/static_results/compare/php7.1.3.html</link>
+			<title>PHP Variable Comparison Cheatsheet for PHP 7.1.3</title>
+			<ror:updatePeriod>monthly</ror:updatePeriod>
+			<ror:sortOrder>4</ror:sortOrder>
+			<ror:resourceOf>sitemap</ror:resourceOf>
+		</item>
 		<item>
 			<link>http://phpcheatsheets.com/static_results/test/php4.3.11.html</link>
 			<title>PHP Variable Testing Cheatsheet for PHP 4.3.11</title>
@@ -1111,6 +1139,13 @@
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
+		<item>
+			<link>http://phpcheatsheets.com/static_results/test/php5.6.30.html</link>
+			<title>PHP Variable Testing Cheatsheet for PHP 5.6.30</title>
+			<ror:updatePeriod>monthly</ror:updatePeriod>
+			<ror:sortOrder>4</ror:sortOrder>
+			<ror:resourceOf>sitemap</ror:resourceOf>
+		</item>
 		<item>
 			<link>http://phpcheatsheets.com/static_results/test/php7.0.0.html</link>
 			<title>PHP Variable Testing Cheatsheet for PHP 7.0.0</title>
@@ -1126,15 +1161,15 @@
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/test/php7.0.10.html</link>
-			<title>PHP Variable Testing Cheatsheet for PHP 7.0.10</title>
+			<link>http://phpcheatsheets.com/static_results/test/php7.0.12.html</link>
+			<title>PHP Variable Testing Cheatsheet for PHP 7.0.12</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/test/php7.0.13.html</link>
-			<title>PHP Variable Testing Cheatsheet for PHP 7.0.13</title>
+			<link>http://phpcheatsheets.com/static_results/test/php7.0.17.html</link>
+			<title>PHP Variable Testing Cheatsheet for PHP 7.0.17</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
@@ -1146,5 +1181,12 @@
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
+		<item>
+			<link>http://phpcheatsheets.com/static_results/test/php7.1.3.html</link>
+			<title>PHP Variable Testing Cheatsheet for PHP 7.1.3</title>
+			<ror:updatePeriod>monthly</ror:updatePeriod>
+			<ror:sortOrder>4</ror:sortOrder>
+			<ror:resourceOf>sitemap</ror:resourceOf>
+		</item>
 	</channel>
 </rss>