Merge pull request #24 from jrfnl/feature/php7-is-here

Updated for PHP7 release
jrfnl · Dec 3, 2015 · 1365a0d · 1365a0d
2 parents 415a99d + 6d1fa4b
commit 1365a0d
Show file tree

Hide file tree

Showing 112 changed files with 509 additions and 504 deletions.
diff --git a/.htaccess b/.htaccess
@@ -57,8 +57,8 @@ RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.8\.html$ ht
 # 5.6.10 => 5.6.11
 RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.10\.html$ http://phpcheatsheets.com/static_results/$1/php5.6.11.html
 
-# 7.0.0alpha1 => 7.0.0RC6
-RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.0alpha1\.html$ http://phpcheatsheets.com/static_results/$1/php7.0.0RC6.html
+# 7.0.0alpha1/RC6 => 7.0.0
+RedirectMatch 301 /static_results/(arithmetic|compare|test)/php7\.0\.0(alpha1|RC[1-8])\.html$ http://phpcheatsheets.com/static_results/$1/php7.0.0.html
 
 
 # Add 404 directives

diff --git a/README.md b/README.md
@@ -42,6 +42,13 @@ In general, a balance is sought between significance and variety.
 
 #### Changelog:
 
+##### 1.3.2 (Dec 3 2015): PHP 7 is here!
+* Renewed static sheets:
+	- Added static sheets for **PHP 7.0.0**.
+	- Removed static sheet generation for PHP 7.0.0-RC6.
+* Fixed static sheets to display the correct 'live' version (moved to server running PHP 5.6.8 - was 5.4.13).
+
+
 ##### 1.3.1 (Nov 2015): PHP 7 is nearly upon us!
 * Renewed static sheets based on currently available and most used versions:
 	- Added static sheets for **PHP 7.0.0-RC6**, 5.6.15, 5.6.13, 5.6.11, 5.6.9, 5.6.7, 5.5.30, 5.5.28, 5.5.21, 5.4.45, 5.4.27, 5.4.41, 5.4.43.

diff --git a/bin/autogen-static-sheets.bat b/bin/autogen-static-sheets.bat
@@ -102,7 +102,7 @@ IF NOT EXIST "%_AUTOGEN_SCRIPT_LOCATION%" GOTO :AUTOGEN_SCRIPT_LOCATION_ERROR EL
 :: 5.4        5.4.45    5.4.45, 5.4.43, 5.4.44, 5.4.41, 5.4.42, 5.4.39, 5.4.36, / 5.4.40, 5.4.16, 5.4.38, 5.4.37, 5.4.35, 5.4.4 (v44, v42, v40, v38, v37, v35 not included in run as 36, 39, 41 and 43 are)
 :: 5.5        5.5.30    5.5.9, 5.5.30, 5.5.29, 5.5.28, 5.5.26, 5.5.27, 5.5.25, 5.5.22, 5.5.21 (v29, v27, v25, and v22 not included in run as 21, 26, 28 and 30 are)
 :: 5.6        5.6.15    5.6.13, 5.6.14, 5.6.12, 5.6.9, 5.6.11, 5.6.10, 5.6.7, 5.6.0, 5.6.8, 5.6.2 (v14, v12, v10 not included as 15, 13 and 11 are)
-:: 7.0        7.0.0RC6
+:: 7.0        7.0.0
 ::
 :: Ubuntu LTS versions: 5.3.2 (U 10.04), 5.3.10 (U 12.04), 5.5.9 (U 14.04)
 :: Debian main releases: 5.3.3 (D 6), 5.4.4 (D 7), 5.6.7 (D 8)
@@ -129,16 +129,14 @@ IF NOT EXIST "%_AUTOGEN_SCRIPT_LOCATION%" GOTO :AUTOGEN_SCRIPT_LOCATION_ERROR EL
 :: 5.6.5 => 5.6.7
 :: 5.6.8 => 5.6.9
 :: 5.6.10 => 5.6.11
-:: 7.0.0alpha1 => 7.0.0RC6
-::
-:: To be added when I can (finally) up the PHP version for the live version:
-:: 5.4.13 (currently live)
+:: 7.0.0alpha1 => 7.0.0
+:: 7.0.0RC6 => 7.0.0
 ::
 ::---------------------------------------------------------------------------------
 
 :: Run autogen for various PHP versions
 :RUN_AUTOGEN
-FOR %%G IN (7.0.0RC6) DO CALL :RUN_AUTOGEN_PHP5 %%G
+FOR %%G IN (7.0.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
 FOR %%G IN (5.6.15 5.6.13 5.6.11 5.6.9 5.6.7 5.6.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
 FOR %%G IN (5.5.30 5.5.28 5.5.26 5.5.21 5.5.16 5.5.9 5.5.3) DO CALL :RUN_AUTOGEN_PHP5 %%G
 FOR %%G IN (5.4.45 5.4.43 5.4.41 5.4.39 5.4.36 5.4.27 5.4.16 5.4.4) DO CALL :RUN_AUTOGEN_PHP5 %%G

diff --git a/bin/autogen-static-sheets.php b/bin/autogen-static-sheets.php
@@ -142,7 +142,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.4.13</option>', // IMPORTANT! Change this if the PHP version on the server changes!!
+		10 => '<option value="live">PHP 5.6.8</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/ror.xml b/ror.xml
@@ -643,8 +643,8 @@
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.0RC6.html</link>
-			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.0RC6</title>
+			<link>http://phpcheatsheets.com/static_results/arithmetic/php7.0.0.html</link>
+			<title>PHP Arithmetic Operations Cheatsheet for PHP 7.0.0</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
@@ -888,8 +888,8 @@
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/compare/php7.0.0RC6.html</link>
-			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.0RC6</title>
+			<link>http://phpcheatsheets.com/static_results/compare/php7.0.0.html</link>
+			<title>PHP Variable Comparison Cheatsheet for PHP 7.0.0</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>
@@ -1133,8 +1133,8 @@
 			<ror:resourceOf>sitemap</ror:resourceOf>
 		</item>
 		<item>
-			<link>http://phpcheatsheets.com/static_results/test/php7.0.0RC6.html</link>
-			<title>PHP Variable Testing Cheatsheet for PHP 7.0.0RC6</title>
+			<link>http://phpcheatsheets.com/static_results/test/php7.0.0.html</link>
+			<title>PHP Variable Testing Cheatsheet for PHP 7.0.0</title>
 			<ror:updatePeriod>monthly</ror:updatePeriod>
 			<ror:sortOrder>4</ror:sortOrder>
 			<ror:resourceOf>sitemap</ror:resourceOf>