Update PHP version-tagged scripts

README.md

@@ -39,5 +39,6 @@ What it sets up
   * phpsh (for Drush)
 * phpsh
 * Vagrant (for managing VirtualBox virtual machines)
+* PHP_CodeSniffer (and set to drupal code standards)
 
 It should take about 40 minutes for everything to install, depending on your machine.

conf_files/ext-imagick.ini

@@ -0,0 +1,2 @@
+[imagick]
+extension="/usr/local/Cellar/php53-imagick/3.1.0RC2/imagick.so"

conf_files/ext-memcached.ini

@@ -0,0 +1,2 @@
+[memcached]
+extension="/usr/local/Cellar/php53-memcached/2.1.0/memcached.so"

conf_files/ext-pcntl.ini

@@ -0,0 +1,2 @@
+[pcntl]
+; extension="/usr/local/Cellar/php53-pcntl/5.3.27/pcntl.so"

conf_files/ext-redis.ini

@@ -0,0 +1,2 @@
+[redis]
+extension="/usr/local/Cellar/php53-redis/2.2.4/redis.so"

conf_files/ext-xdebug.ini

@@ -0,0 +1,4 @@
+[xdebug]
+zend_extension="/usr/local/Cellar/php53-xdebug/2.2.3/xdebug.so"
+cli_color=2
+collect_assignments=1

conf_files/ext-xhprof.ini

@@ -0,0 +1,2 @@
+[xhprof]
+extension="/usr/local/Cellar/php53-xhprof/254eb24/xhprof.so"

conf_files/httpd.conf

@@ -48,9 +48,7 @@ ServerRoot "/usr"
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
-<IfDefine !MACOSXSERVER>
 Listen 80
-</IfDefine>
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -109,12 +107,11 @@ LoadModule speling_module libexec/apache2/mod_speling.so
 LoadModule alias_module libexec/apache2/mod_alias.so
 LoadModule rewrite_module libexec/apache2/mod_rewrite.so
 #LoadModule php5_module libexec/apache2/libphp5.so
-LoadModule php5_module    /usr/local/Cellar/php/5.3.10/libexec/apache2/libphp5.so
+LoadModule php5_module    /usr/local/Cellar/php53/5.3.27/libexec/apache2/libphp5.so
 #Apple specific modules
-LoadModule apple_userdir_module libexec/apache2/mod_userdir_apple.so
-LoadModule bonjour_module libexec/apache2/mod_bonjour.so
+#LoadModule apple_userdir_module libexec/apache2/mod_userdir_apple.so
+#LoadModule bonjour_module libexec/apache2/mod_bonjour.so
 
-<IfDefine !MACOSXSERVER>
 LoadModule authn_dbm_module libexec/apache2/mod_authn_dbm.so
 LoadModule authn_anon_module libexec/apache2/mod_authn_anon.so
 LoadModule authn_dbd_module libexec/apache2/mod_authn_dbd.so
@@ -132,20 +129,6 @@ LoadModule proxy_connect_module libexec/apache2/mod_proxy_connect.so
 LoadModule proxy_ftp_module libexec/apache2/mod_proxy_ftp.so
 LoadModule proxy_ajp_module libexec/apache2/mod_proxy_ajp.so
 LoadModule status_module libexec/apache2/mod_status.so
-</IfDefine>
-
-<IfDefine MACOSXSERVER>
-LoadModule hfs_apple_module libexec/apache2/mod_hfs_apple.so
-#LoadModule auth_digest_apple_module libexec/apache2/mod_auth_digest_apple.so
-#LoadModule encoding_module libexec/apache2/mod_encoding.so
-#LoadModule jk_module libexec/apache2/mod_jk.so
-LoadModule apple_auth_module libexec/apache2/mod_auth_apple.so
-LoadModule spnego_auth_module libexec/apache2/mod_spnego_apple.so
-LoadModule apple_digest_module libexec/apache2/mod_digest_apple.so
-#LoadModule python_module libexec/apache2/mod_python.so
-#LoadModule xsendfile_module libexec/apache2/mod_xsendfile.so
-LoadModule apple_status_module libexec/apache2/mod_status_apple.so
-</IfDefine>
 
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -187,51 +170,7 @@ ServerAdmin you@example.com
 #
 #ServerName www.example.com:80
 
-<IfDefine MACOSXSERVER>
-DocumentRoot /var/empty
 
-<IfModule mod_auth_digest_apple.c>
-        BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-</IfModule>
-<IfModule mod_headers.c>
-        Header add MS-Author-Via "DAV"
-        RequestHeader set X_FORWARDED_PROTO 'https' env=https
-        RequestHeader set X_FORWARDED_PROTO 'http' env=!https
-</IfModule>
-<IfModule mod_encoding.c>
-        EncodingEngine on
-        NormalizeUsername on
-        DefaultClientEncoding UTF-8
-# Windows XP?
-        AddClientEncoding "Microsoft-WebDAV-MiniRedir/" MSUTF-8
-# Windows 2K SP2 with .NET
-        AddClientEncoding "(Microsoft .* DAV\$)" MSUTF-8
-# Windows 2K SP2/Windows XP
-        AddClientEncoding "(Microsoft .* DAV 1.1)" CP932
-# Windows XP?
-        AddClientEncoding "Microsoft-WebDAV*" CP932
-# RealPlayer
-        AddClientEncoding "RMA/*" CP932
-# MacOS X webdavfs
-        AddClientEncoding "WebDAVFS" UTF-8
-# cadaver
-        AddClientEncoding "cadaver/" EUC-JP
-</IfModule>
-<Directory /usr/share/web>
-	AllowOverride None
-	Options MultiViews FollowSymlinks
-	Order allow,deny
-	Allow from all
-	Header Set Cache-Control no-cache
-</Directory>
-Alias /webmail /usr/share/web/webmail.html
-Alias /changepassword /usr/share/web/changepassword.html
-Alias /profilemanager /usr/share/web/profilemanager.html
-Alias /webcal /usr/share/web/webcal.html
-</IfDefine>
-
-<IfDefine !MACOSXSERVER>
-<IfDefine WEBSHARING_ON>
 #
 # DocumentRoot: The directory out of which you will serve your
 # documents. By default, all requests are taken from this directory, but
@@ -303,8 +242,7 @@ DocumentRoot "/Users/@@USER@@/htdocs"
 <IfModule dir_module>
     DirectoryIndex index.html
 </IfModule>
-</IfDefine>
-</IfDefine>
+
 #
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
@@ -610,15 +548,14 @@ LockFile "/private/var/log/apache2/accept.lock"
 # Language settings
 Include /private/etc/apache2/extra/httpd-languages.conf
 
-<IfDefine WEBSHARING_ON>
 # Multi    -language error messages
 #Include /private/etc/apache2/extra/httpd-multilang-errordoc.conf
 
 # Fancy directory listings
 Include /private/etc/apache2/extra/httpd-autoindex.conf
 
 # User home directories
-Include /private/etc/apache2/extra/httpd-userdir.conf
+# Include /private/etc/apache2/extra/httpd-userdir.conf
 
 # Real-time info on requests and configuration
 #Include /private/etc/apache2/extra/httpd-info.conf
@@ -635,25 +572,8 @@ Include /private/etc/apache2/extra/httpd-manual.conf
 # Custom config.
 Include /private/etc/apache2/extra/httpd-extra-config.conf
 
-</IfDefine>
-
 # Secure (SSL/TLS) connections
-<IfDefine !MACOSXSERVER>
 #Include /private/etc/apache2/extra/httpd-ssl.conf
-</IfDefine>
-<IfDefine MACOSXSERVER>
-<IfModule mod_ssl.c>
-        SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-        SSLPassPhraseDialog exec:/etc/apache2/getsslpassphrase
-        SSLSessionCache shmcb:/var/run/ssl_scache(512000)
-        SSLSessionCacheTimeout 300
-        SSLMutex file:/var/run/ssl_mutex
-        SSLRandomSeed startup builtin
-        SSLRandomSeed connect builtin
-        AddType application/x-x509-ca-cert crt
-        AddType application/x-pkcs7-crl crl
-</IfModule>
-</IfDefine>
 
 <IfModule mod_jk.c>
         JKWorkersFile /etc/apache2/workers.properties
@@ -668,17 +588,5 @@ Include /private/etc/apache2/extra/httpd-extra-config.conf
 		DirectoryIndex index.html index.php
 	</IfModule>
 </IfModule>
-<IfDefine !MACOSXSERVER>
-    Include /etc/apache2/other/*.conf
-</IfDefine>
-<IfDefine MACOSXSERVER>
-    <IfDefine WEBSERVICE_ON>
-        Include /etc/apache2/sites/*.conf
-    </IfDefine>
-    <IfDefine !WEBSERVICE_ON>
-        Include /etc/apache2/sites/virtual_host_global.conf
-        Include /etc/apache2/sites/*_.conf
-        Include /etc/apache2/sites/*__shadow.conf
-    </IfDefine>
-</IfDefine>
 
+Include /etc/apache2/other/*.conf

conf_files/my.cnf

@@ -24,7 +24,7 @@ slow_query_log=OFF
 max_connections=400
 
 # Don't run out of file descriptors!
-open_files_limit=32768
+open_files_limit=16384
 
 # If you set the query cache too high, your server risks severly slowing down and taking tens of seconds after an INSERT due to query cache mutex contention.
 query_cache_limit=1M

conf_files/php.ini

@@ -19,7 +19,7 @@
 ; See the PHP docs for more specific information.
 ; http://php.net/configuration.file
 
-; The syntax of the file is extremely simple.  Whitespace and Lines
+; The syntax of the file is extremely simple.  Whitespace and lines
 ; beginning with a semicolon are silently ignored (as you probably guessed).
 ; Section headers (e.g. [Foo]) are also silently ignored, even though
 ; they might mean something in the future.
@@ -419,6 +419,10 @@ disable_classes =
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120
 
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
 ;;;;;;;;;;;;;;;;;
 ; Miscellaneous ;
 ;;;;;;;;;;;;;;;;;
@@ -437,7 +441,7 @@ expose_php = On
 ; Maximum execution time of each script, in seconds
 ; http://php.net/max-execution-time
 ; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 30
+max_execution_time = 180
 
 ; Maximum amount of time each script may spend parsing request data. It's a good
 ; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -447,15 +451,18 @@ max_execution_time = 30
 ; Development Value: 60 (60 seconds)
 ; Production Value: 60 (60 seconds)
 ; http://php.net/max-input-time
-max_input_time = 60
+max_input_time = 180
 
 ; Maximum input variable nesting level
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 128M
+memory_limit = 512M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
@@ -477,7 +484,7 @@ memory_limit = 128M
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 6.0.0)
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)
@@ -529,7 +536,7 @@ error_reporting = E_ALL | E_STRICT
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-errors
-display_errors = Off
+display_errors = On
 
 ; The display of errors which occur during PHP's startup sequence are handled
 ; separately from display_errors. PHP's default behavior is to suppress those
@@ -540,7 +547,7 @@ display_errors = Off
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-startup-errors
-display_startup_errors = Off
+display_startup_errors = On
 
 ; Besides displaying errors, PHP can also log errors to locations such as a
 ; server-specific log, STDERR, or a location specified by the error_log
@@ -1235,7 +1242,7 @@ mysql.default_password =
 
 ; Maximum time (in seconds) for connect timeout. -1 means no limit
 ; http://php.net/mysql.connect-timeout
-mysql.connect_timeout = 60
+mysql.connect_timeout = 180
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
 ; SQL-Errors will be displayed.
@@ -1296,12 +1303,12 @@ mysqli.default_pw =
 mysqli.reconnect = Off
 
 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = Off
@@ -1703,7 +1710,7 @@ mssql.secure_connection = Off
 ;mssql.max_procs = -1
 
 ; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
 
@@ -1896,35 +1903,6 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
-[xdebug]
-;zend_extension="/usr/local/Cellar/php/5.3.6/lib/php/extensions/no-debug-non-zts-20090626/xdebug.so"
-;extension="xdebug.so"
-extension="xdebug.so"
-xdebug.remote_enable=on
-xdebug.remote_handler=dbgp
-xdebug.remote_host=127.0.0.1
-xdebug.remote_port=9000
-xdebug.idekey="netbeans-xdebug"
-
-[apc]
-extension="apc.so"
-apc.shm_size=64M
-
-[memcached]
-extension="memcached.so"
-
-[xhprof]
-extension="xhprof.so"
-
-[imagemagick]
-extension="imagemagick.so"
-
-[redis]
-extension="redis.so"
-
-[pcntl]
-extension="pcntl.so"
-
 ; Local Variables:
 ; tab-width: 4
 ; End: