Browse Source

Merge pull request #1087 from greg-hellings/php_5.5.17_upgrade

PHP: Upgrade version, fix a number of broken tests
Hamilton Turner 11 years ago
parent
commit
3d55b9cb8f
52 changed files with 80 additions and 79 deletions
  1. 3 1
      config/php.ini
  2. 1 1
      frameworks/PHP/cakephp/README.md
  3. 3 1
      frameworks/PHP/cakephp/app/Config/core.php
  4. 1 1
      frameworks/PHP/cakephp/bash_profile.sh
  5. 2 1
      frameworks/PHP/cakephp/setup.py
  6. 1 1
      frameworks/PHP/hhvm/bash_profile.sh
  7. 1 1
      frameworks/PHP/php-codeigniter/README.md
  8. 1 1
      frameworks/PHP/php-codeigniter/bash_profile.sh
  9. 1 1
      frameworks/PHP/php-fatfree/bash_profile.sh
  10. 1 1
      frameworks/PHP/php-fuel/README.md
  11. 1 1
      frameworks/PHP/php-fuel/bash_profile.sh
  12. 1 1
      frameworks/PHP/php-kohana/README.md
  13. 10 15
      frameworks/PHP/php-kohana/application/config/database.php
  14. 1 1
      frameworks/PHP/php-kohana/bash_profile.sh
  15. 1 1
      frameworks/PHP/php-laravel/bash_profile.sh
  16. 1 1
      frameworks/PHP/php-laravel/readme.md
  17. 1 1
      frameworks/PHP/php-lithium/README.md
  18. 1 1
      frameworks/PHP/php-lithium/bash_profile.sh
  19. 1 1
      frameworks/PHP/php-micromvc/README.md
  20. 1 1
      frameworks/PHP/php-micromvc/bash_profile.sh
  21. 1 1
      frameworks/PHP/php-phalcon-micro/README.md
  22. 1 1
      frameworks/PHP/php-phalcon-micro/bash_profile.sh
  23. 1 1
      frameworks/PHP/php-phalcon/README.md
  24. 1 1
      frameworks/PHP/php-phalcon/bash_profile.sh
  25. 1 1
      frameworks/PHP/php-phpixie/bash_profile.sh
  26. 1 1
      frameworks/PHP/php-pimf/README.md
  27. 1 1
      frameworks/PHP/php-pimf/bash_profile.sh
  28. 1 1
      frameworks/PHP/php-senthot/bash_profile.sh
  29. 1 1
      frameworks/PHP/php-silex-orm/README.md
  30. 1 1
      frameworks/PHP/php-silex-orm/bash_profile.sh
  31. 1 1
      frameworks/PHP/php-silex-orm/web/index.php
  32. 1 1
      frameworks/PHP/php-silex/README.md
  33. 1 1
      frameworks/PHP/php-silex/bash_profile.sh
  34. 1 1
      frameworks/PHP/php-silica/README.md
  35. 1 1
      frameworks/PHP/php-silica/bash_profile.sh
  36. 1 1
      frameworks/PHP/php-slim/README.md
  37. 1 1
      frameworks/PHP/php-slim/bash_profile.sh
  38. 1 1
      frameworks/PHP/php-symfony2-stripped/README.md
  39. 1 1
      frameworks/PHP/php-symfony2-stripped/bash_profile.sh
  40. 1 1
      frameworks/PHP/php-symfony2/README.md
  41. 2 2
      frameworks/PHP/php-symfony2/app/config/config_prod.yml
  42. 1 1
      frameworks/PHP/php-symfony2/bash_profile.sh
  43. 1 1
      frameworks/PHP/php-yaf/bash_profile.sh
  44. 1 1
      frameworks/PHP/php-yii2/bash_profile.sh
  45. 1 1
      frameworks/PHP/php-zend-framework/bash_profile.sh
  46. 1 1
      frameworks/PHP/php/README.md
  47. 1 1
      frameworks/PHP/php/bash_profile.sh
  48. 1 1
      frameworks/PHP/php/deploy/nginx.conf
  49. 2 2
      frameworks/PHP/php/deploy/php
  50. 1 1
      frameworks/PHP/phreeze/bash_profile.sh
  51. 1 1
      toolset/setup/linux/languages/composer.sh
  52. 13 12
      toolset/setup/linux/languages/php.sh

+ 3 - 1
config/php.ini

@@ -865,7 +865,9 @@ default_socket_timeout = 60
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 ;
-extension=apc.so
+;extension=apc.so
+zend_extension=opcache.so
+extension=redis.so
 extension=phalcon.so
 extension=yaf.so
 ;extension=php_bz2.dll

+ 1 - 1
frameworks/PHP/cakephp/README.md

@@ -19,7 +19,7 @@ Uses the CakePHP Model functionality.
 The tests were run with:
 
 * [Cake Version 2.3.0](http://cakephp.org/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 3 - 1
frameworks/PHP/cakephp/app/Config/core.php

@@ -248,7 +248,7 @@ Configure::write('App.baseUrl', env('SCRIPT_NAME'));
  *       Please check the comments in boostrap.php for more info on the cache engines available
  *       and their setttings.
  */
-$engine = 'Apc';
+$engine = 'Redis';
 
 // In development mode, caches should expire quickly.
 $duration = '+999 days';
@@ -265,6 +265,7 @@ $prefix = 'myapp_';
  */
 Cache::config('_cake_core_', array(
 	'engine' => $engine,
+	'server' => 'REDISSERVER',
 	'prefix' => $prefix . 'cake_core_',
 	'path' => CACHE . 'persistent' . DS,
 	'serialize' => ($engine === 'File'),
@@ -277,6 +278,7 @@ Cache::config('_cake_core_', array(
  */
 Cache::config('_cake_model_', array(
 	'engine' => $engine,
+	'server' => 'REDISSERVER',
 	'prefix' => $prefix . 'cake_model_',
 	'path' => CACHE . 'models' . DS,
 	'serialize' => ($engine === 'File'),

+ 1 - 1
frameworks/PHP/cakephp/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 2 - 1
frameworks/PHP/cakephp/setup.py

@@ -8,13 +8,14 @@ from os.path import expanduser
 def start(args, logfile, errfile):
   fwroot = args.fwroot
   setup_util.replace_text("cakephp/app/Config/database.php", "'host' => '.*',", "'host' => '" + args.database_host + "',")
+  setup_util.replace_text("cakephp/app/Config/core.php", "'REDISSERVER'", "'" + args.database_host + "'")
   setup_util.replace_text("cakephp/deploy/cake", "\".*\/FrameworkBenchmarks/cakephp", "\"%s" % args.troot)
   setup_util.replace_text("cakephp/deploy/cake", "Directory .*\/FrameworkBenchmarks/cakephp", "Directory %s" % args.troot)
   setup_util.replace_text("cakephp/deploy/nginx.conf", "root .*\/FrameworkBenchmarks/cakephp", "root %s" % args.troot)
 
   try:
     if os.name == 'nt':
-      setup_util.replace_text("cakephp/app/Config/core.php", "'Apc'", "'Wincache'")
+      setup_util.replace_text("cakephp/app/Config/core.php", "'Redis'", "'Wincache'")
       subprocess.check_call('icacls "C:\\FrameworkBenchmarks\\cakephp" /grant "IIS_IUSRS:(OI)(CI)F"', shell=True, stderr=errfile, stdout=logfile)
       subprocess.check_call('appcmd add site /name:PHP /bindings:http/*:8080: /physicalPath:"C:\\FrameworkBenchmarks\\cakephp\\app\\webroot"', shell=True, stderr=errfile, stdout=logfile)
       return 0

+ 1 - 1
frameworks/PHP/hhvm/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-codeigniter/README.md

@@ -18,7 +18,7 @@ Uses the db abstraction class from Codeigniter
 The tests were run with:
 
 * [Codeigniter Version 2.1.3](http://ellislab.com/codeigniter)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-codeigniter/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-fatfree/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-fuel/README.md

@@ -18,7 +18,7 @@ Uses the Fuel ORM
 The tests were run with:
 
 * [FuelPHP 1.5.3](http://fuelphp.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-fuel/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-kohana/README.md

@@ -18,7 +18,7 @@ Uses the db abstraction class from Kohana
 The tests were run with:
 
 * [Kohana Version 3.3.0](http://kohanaframework.org/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 10 - 15
frameworks/PHP/php-kohana/application/config/database.php

@@ -4,22 +4,17 @@ return array
 (
     'default' => array
     (
-        'type'       => 'MySQL',
+        'type'       => 'PDO',
         'connection' => array(
-            /**
-             * The following options are available for MySQL:
-             *
-             * string   hostname     server hostname, or socket
-             * string   database     database name
-             * string   username     database username
-             * string   password     database password
-             * boolean  persistent   use persistent connections?
-             * array    variables    system variables as "key => value" pairs
-             *
-             * Ports and sockets may be appended to the hostname.
-             */
-            'hostname'   => 'localhost',
-            'database'   => 'hello_world',
+		/**
+		 * The following options are available for PDO:
+		 *
+		 * string   dsn         Data Source Name
+		 * string   username    database username
+		 * string   password    database password
+		 * boolean  persistent  use persistent connections?
+		 */
+	    'dsn'        => 'mysql:host=localhost;dbname=hello_world',
             'username'   => 'benchmarkdbuser',
             'password'   => 'benchmarkdbpass',
             'persistent' => FALSE,

+ 1 - 1
frameworks/PHP/php-kohana/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-laravel/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-laravel/readme.md

@@ -23,7 +23,7 @@ Uses Laravels template engine 'blade'
 The tests were run with:
 
 * [Laravel Version 3.2.14](http://laravel.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-lithium/README.md

@@ -18,7 +18,7 @@ Uses the db model class from Lithium
 The tests were run with:
 
 * [Lithium Version 0.11](http://lithify.me)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-lithium/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-micromvc/README.md

@@ -18,7 +18,7 @@ Uses the built-in ORM of micromvc
 The tests were run with:
 
 * [Micromvc 4.0.0](http://www.micromvc.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-micromvc/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-phalcon-micro/README.md

@@ -23,7 +23,7 @@ Uses Phalcon's template engine 'Volt'
 The tests were run with:
 
 * [Phalcon 1.0.0](http://phalconphp.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM, APC and Phalcon extension
+* [PHP Version 5.5.17](http://www.php.net/) with FPM, APC and Phalcon extension
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-phalcon-micro/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-phalcon/README.md

@@ -24,7 +24,7 @@ Uses Phalcons template engine 'Volt'
 The tests were run with:
 
 * [Phalcon 1.0.0](http://phalconphp.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM, APC and Phalcon extension
+* [PHP Version 5.5.17](http://www.php.net/) with FPM, APC and Phalcon extension
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 * [MongoDB 2.4.8](https://mongodb.org/)

+ 1 - 1
frameworks/PHP/php-phalcon/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-phpixie/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-pimf/README.md

@@ -23,7 +23,7 @@ Uses PIMF plain vanilla PHTML rendering
 The tests were run with:
 
 * [PIMF Version 1.8.6](http://pimf-framework.de/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-pimf/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-senthot/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-silex-orm/README.md

@@ -19,7 +19,7 @@ The tests were run with:
 
 * [Silex Version 1.0](http://silex.sensiolabs.org/)
 * [Doctrine ORM Service Provider](https://github.com/dflydev/dflydev-doctrine-orm-service-provider)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.2.7](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-silex-orm/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-silex-orm/web/index.php

@@ -35,7 +35,7 @@ $app->register(new DoctrineOrmServiceProvider, array(
                 'use_simple_annotation_reader' => false,
             ),
         ),
-        'metadata_cache' => 'apc'
+        'metadata_cache' => 'redis'
     ),
 ));
 

+ 1 - 1
frameworks/PHP/php-silex/README.md

@@ -18,7 +18,7 @@ Uses the Doctrine DBAL functionality.
 The tests were run with:
 
 * [Silex Version 1.0](http://silex.sensiolabs.org/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-silex/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-silica/README.md

@@ -18,7 +18,7 @@ Uses the Doctrine DBAL functionality.
 The tests were run with:
 
 * [Silica dev-master](https://github.com/changloong/Silica)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-silica/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-slim/README.md

@@ -19,7 +19,7 @@ The tests were run with:
 
 * [Slim 2.2.0](http://www.slimframework.com/)
 * [RedBeanPHP 3.4.2](http://redbeanphp.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-slim/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-symfony2-stripped/README.md

@@ -24,7 +24,7 @@ Uses Symfony's template engine 'Twig'
 The tests were run with:
 
 * [Symfony Version 2.2.1](http://symfony.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 1 - 1
frameworks/PHP/php-symfony2-stripped/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-symfony2/README.md

@@ -24,7 +24,7 @@ Uses Symfony's template engine 'Twig'
 The tests were run with:
 
 * [Symfony Version 2.2.1](http://symfony.com/)
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

+ 2 - 2
frameworks/PHP/php-symfony2/app/config/config_prod.yml

@@ -13,9 +13,9 @@ framework:
 
 doctrine:
     orm:
-        metadata_cache_driver: apc
+        metadata_cache_driver: redis
         #result_cache_driver: apc
-        query_cache_driver: apc
+        query_cache_driver: redis
 
 monolog:
     handlers:

+ 1 - 1
frameworks/PHP/php-symfony2/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-yaf/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-yii2/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php-zend-framework/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php/README.md

@@ -15,7 +15,7 @@ Use the PHP standard [JSON encoder](http://www.php.net/manual/en/function.json-e
 ## Infrastructure Software Versions
 The tests were run with:
 
-* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
 * [nginx 1.4.0](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 * [PHP ActiveRecord Nightly 20121221](http://www.phpactiverecord.org/)

+ 1 - 1
frameworks/PHP/php/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
frameworks/PHP/php/deploy/nginx.conf

@@ -69,7 +69,7 @@ http {
         # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
         #
         location ~ \.php$ {
-            root /home/hyoung/FrameworkBenchmarks/php;
+            root /home/ubuntu/FrameworkBenchmarks/frameworks/PHP/php;
             fastcgi_pass   fastcgi_backend;
 #            fastcgi_pass 127.0.0.1:9001;
             fastcgi_index  index.php;

+ 2 - 2
frameworks/PHP/php/deploy/php

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /php/ "/home/hyoung/FrameworkBenchmarks/php/"
-  <Directory /home/hyoung/FrameworkBenchmarks/php/>
+  Alias /php/ "/home/ubuntu/FrameworkBenchmarks/frameworks/PHP/php/"
+  <Directory /home/ubuntu/FrameworkBenchmarks/frameworks/PHP/php/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

+ 1 - 1
frameworks/PHP/phreeze/bash_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PHP_HOME=${IROOT}/php-5.4.13
+export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 

+ 1 - 1
toolset/setup/linux/languages/composer.sh

@@ -9,7 +9,7 @@ fw_get https://getcomposer.org/installer -O composer-installer.php
 mkdir -p php-composer
 
 # Use the PHP from our IROOT directory
-PHP_HOME=${IROOT}/php-5.4.13
+PHP_HOME=${IROOT}/php-5.5.17
 ${PHP_HOME}/bin/php composer-installer.php --install-dir=$IROOT/php-composer
 
 touch php-composer.installed

+ 13 - 12
toolset/setup/linux/languages/php.sh

@@ -11,20 +11,20 @@ RETCODE=$(fw_exists php.installed)
   sudo cp $FWROOT/config/php-fpm.conf /usr/local/lib/php-fpm.conf
   return 0; }
 
-fw_get http://museum.php.net/php5/php-5.4.13.tar.gz -O php-5.4.13.tar.gz
-fw_untar php-5.4.13.tar.gz
+fw_get http://php.net/distributions/php-5.5.17.tar.gz -O php-5.5.17.tar.gz
+fw_untar php-5.5.17.tar.gz
 ls
-mv php-5.4.13 php
+mv php-5.5.17 php
 ls
 cd php
 
-./configure --prefix=$IROOT/php-5.4.13 --with-pdo-mysql --with-mysql --with-mcrypt --enable-intl --enable-mbstring --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --with-openssl
+./configure --prefix=$IROOT/php-5.5.17 --with-pdo-mysql --with-mysql --with-mcrypt --enable-intl --enable-mbstring --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --with-openssl --enable-opcache
 make
 make install
 cd ..
 
-cp $FWROOT/config/php.ini $IROOT/php-5.4.13/lib/php.ini
-cp $FWROOT/config/php-fpm.conf $IROOT/php-5.4.13/lib/php-fpm.conf
+cp $FWROOT/config/php.ini $IROOT/php-5.5.17/lib/php.ini
+cp $FWROOT/config/php-fpm.conf $IROOT/php-5.5.17/lib/php-fpm.conf
 
 # =======================
 #
@@ -35,22 +35,23 @@ cp $FWROOT/config/php-fpm.conf $IROOT/php-5.4.13/lib/php-fpm.conf
 echo PHP compilation finished, building modules
 
 # Apc.so
-$IROOT/php-5.4.13/bin/pecl config-set php_ini $IROOT/php-5.4.13/lib/php.ini
-printf "\n" | $IROOT/php-5.4.13/bin/pecl install -f apc-beta
+$IROOT/php-5.5.17/bin/pecl config-set php_ini $IROOT/php-5.5.17/lib/php.ini
+#printf "\n" | $IROOT/php-5.5.17/bin/pecl install -f apc-beta
+printf "\n" | $IROOT/php-5.5.17/bin/pecl install -f redis
 
 # yaf.so
-printf "\n" | $IROOT/php-5.4.13/bin/pecl install -f yaf
+printf "\n" | $IROOT/php-5.5.17/bin/pecl install -f yaf
 
 # phalcon.so
 #   The configure seems broken, does not respect prefix. If you 
 #   update the value of PATH then it finds the prefix from `which php`
-export PATH=$IROOT/php-5.4.13/bin:$IROOT/php-5.4.13/sbin:$PATH
+export PATH=$IROOT/php-5.5.17/bin:$IROOT/php-5.5.17/sbin:$PATH
 git clone git://github.com/phalcon/cphalcon.git
 cd cphalcon
 git checkout phalcon-v1.3.2
 cd build/64bits 
-$IROOT/php-5.4.13/bin/phpize
-./configure --prefix=$IROOT/php-5.4.13 --enable-phalcon
+$IROOT/php-5.5.17/bin/phpize
+./configure --prefix=$IROOT/php-5.5.17 --enable-phalcon
 make
 make install