Skip to content

Commit

Permalink
Merge pull request #25 from jrfnl/feature/update-static-sheets
Browse files Browse the repository at this point in the history
Feature/update static sheets
  • Loading branch information
jrfnl committed Mar 11, 2016
2 parents df34563 + feb24df commit c90dfa5
Show file tree
Hide file tree
Showing 119 changed files with 353,087 additions and 132,885 deletions.
22 changes: 14 additions & 8 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@ RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.4\.(11|20)\.ht
# 5.4.33/35/37 => 5.4.36
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.4\.3[357]\.html$ http://phpcheatsheets.com/static_results/$1/php5.4.36.html

# 5.4.42 => 5.4.43
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.4\.42\.html$ http://phpcheatsheets.com/static_results/$1/php5.4.43.html
# 5.4.39/42 => 5.4.41
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.4\.(39|42)\.html$ http://phpcheatsheets.com/static_results/$1/php5.4.41.html

# 5.4.43 => 5.4.45
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.4\.43\.html$ http://phpcheatsheets.com/static_results/$1/php5.4.45.html

# 5.5.18 => 5.5.16
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.5\.18\.html$ http://phpcheatsheets.com/static_results/$1/php5.5.16.html

# 5.5.20/22 => 5.5.21
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.5\.2[02]\.html$ http://phpcheatsheets.com/static_results/$1/php5.5.21.html
# 5.5.20/21/24 => 5.5.22
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.5\.2[014]\.html$ http://phpcheatsheets.com/static_results/$1/php5.5.22.html

# 5.5.24 => 5.5.26
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.5\.24\.html$ http://phpcheatsheets.com/static_results/$1/php5.5.26.html
# 5.5.26 => 5.5.28
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.5\.26\.html$ http://phpcheatsheets.com/static_results/$1/php5.5.28.html

# 5.6.2 => 5.6.0
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.2\.html$ http://phpcheatsheets.com/static_results/$1/php5.6.0.html
Expand All @@ -54,8 +57,11 @@ RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.[45]\.html$
# 5.6.8 => 5.6.9
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.8\.html$ http://phpcheatsheets.com/static_results/$1/php5.6.9.html

# 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
# 5.6.10 => 5.6.9
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.10\.html$ http://phpcheatsheets.com/static_results/$1/php5.6.9.html

# 5.6.11 => 5.6.13
RedirectMatch 301 /static_results/(arithmetic|compare|test)/php5\.6\.11\.html$ http://phpcheatsheets.com/static_results/$1/php5.6.13.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
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Static versions of the cheatsheets are generated using a variety of PHP versions

These PHP versions will include:
* [Always] Latest release for each minor PHP version at the time of (re-)generation of the static sheets.
* [Always] The PHP versions included in [Ubuntu LTS releases](http://distrowatch.com/table.php?distribution=Ubuntu).
* [Always] The PHP versions included in [Ubuntu](http://distrowatch.com/table.php?distribution=Ubuntu), [Debian](http://distrowatch.com/table.php?distribution=debian) and [CentOS](http://distrowatch.com/table.php?distribution=centos) LTS releases.
* [Selectively] Popular minor releases based on [worldwide usage statistics](http://w3techs.com/technologies/details/pl-php/all/all) at the time of (re-)generation of the static sheets.
* [Selectively] Previously included versions if no other close minor release will be included.

Expand All @@ -42,6 +42,11 @@ In general, a balance is sought between significance and variety.

#### Changelog:

##### 1.3.2.1 (Mar x 2016)
* Renewed static sheets:
- Added static sheets for PHP 7.0.4, 7.0.2, 5.6.19, 5.6.17, 5.5.33, 5.5.22.
- Removed static sheet generation for PHP 5.6.11, 5.5.26, 5.5.21, 5.4.43, 5.4.39.

##### 1.3.2 (Dec 3 2015): PHP 7 is here!
* Renewed static sheets:
- Added static sheets for **PHP 7.0.0**.
Expand Down
30 changes: 17 additions & 13 deletions bin/autogen-static-sheets.bat
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ IF NOT EXIST "%_AUTOGEN_SCRIPT_LOCATION%" GOTO :AUTOGEN_SCRIPT_LOCATION_ERROR EL
:: 5.1 5.1.6 5.1.6
:: 5.2 5.2.17 5.2.17, 5.2.6, 5.2.9
:: 5.3 5.3.29 5.3.29, 5.3.3, 5.3.28, 5.3.10, 5.3.27 (v28 not included in run as 27 + 29 are)
:: 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.0
:: 5.4 5.4.45 5.4.45, 5.4.43, 5.4.16, 5.4.41, 5.4.44, 5.4.36, 5.4.39, 5.4.42, 5.4.4 (v44, v43, v42, v39 not included in run as 41 and 36 are)
:: 5.5 5.5.33 5.5.9, 5.5.30, 5.5.31, 5.5.32, 5.5.29, 5.5.28, 5.5.22 (v31, v32, v29 and v21 not included in run as 22, 28, 30 and 33 are)
:: 5.6 5.6.19 5.6.18, 5.6.17, 5.6.16, 5.6.14, 5.6.15, 5.6.13, 5.6.12, 5.6.0, 5.6.11, 5.6.9 (v14, v12, v10 not included as 15, 13 and 11 are)
:: 7.0 7.0.4 7.0.3, 7.0.2, 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)
Expand All @@ -119,27 +119,31 @@ IF NOT EXIST "%_AUTOGEN_SCRIPT_LOCATION%" GOTO :AUTOGEN_SCRIPT_LOCATION_ERROR EL
:: 5.4.33 => 5.4.36
:: 5.4.35 => 5.4.36
:: 5.4.37 => 5.4.36
:: 5.4.42 => 5.4.43
:: 5.4.39 => 5.4.41
:: 5.4.42 => 5.4.41
:: 5.4.43 => 5.4.45
:: 5.5.18 => 5.5.16
:: 5.5.20 => 5.5.21
:: 5.5.22 => 5.5.21
:: 5.5.24 => 5.5.26
:: 5.5.20 => 5.5.22
:: 5.5.21 => 5.5.22
:: 5.5.24 => 5.5.22
:: 5.5.26 => 5.5.28
:: 5.6.2 => 5.6.0
:: 5.6.4 => 5.6.7
:: 5.6.5 => 5.6.7
:: 5.6.8 => 5.6.9
:: 5.6.10 => 5.6.11
:: 5.6.10 => 5.6.9
:: 5.6.11 => 5.6.13
:: 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.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
FOR %%G IN (7.0.4 7.0.2 7.0.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
FOR %%G IN (5.6.19 5.6.17 5.6.15 5.6.13 5.6.9 5.6.7 5.6.0) DO CALL :RUN_AUTOGEN_PHP5 %%G
FOR %%G IN (5.5.33 5.5.30 5.5.28 5.5.22 5.5.16 5.5.9 5.5.3) 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 5.3.2) DO CALL :RUN_AUTOGEN_PHP5 %%G
FOR %%G IN (5.2.17 5.2.9-2 5.2.6) DO CALL :RUN_AUTOGEN_PHP5 %%G
FOR %%G IN (5.1.6 5.0.5 5.0.4) DO CALL :RUN_AUTOGEN_PHP5 %%G
Expand Down
3 changes: 3 additions & 0 deletions class.vartype-php5.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class VartypePHP5 {
public static $tests = array(
/**
* String comparison functions.
*
* @see class.vartype-compare.php
*/
'strcmp' => array(
Expand Down Expand Up @@ -55,6 +56,7 @@ class VartypePHP5 {

/**
* Loose type juggling.
*
* @see class.vartype-test.php
*/
'juggle_int' => array(
Expand Down Expand Up @@ -121,6 +123,7 @@ class VartypePHP5 {

/**
* Some object related functions.
*
* @see class.vartype-test.php
*/
'instanceof' => array(
Expand Down
1 change: 1 addition & 0 deletions class.vartype-php7.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class VartypePHP7 {
public static $tests = array(
/**
* Functions where errors have been turned into exceptions.
*
* @see class.vartype-arithmetic.php
*/
'modulus' => array(
Expand Down
1 change: 1 addition & 0 deletions class.vartype-test.php
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ class VartypeTest extends Vartype {

/**
* Tests using CastToType class.
*
* @see https://github.com/jrfnl/PHP-cast-to-type.git
*/
'cast_to_type_array' => array(
Expand Down
Loading

0 comments on commit c90dfa5

Please sign in to comment.