diff --git a/features/gc.xml b/features/gc.xml index ef6e6e0201..d5945a4e51 100644 --- a/features/gc.xml +++ b/features/gc.xml @@ -566,7 +566,7 @@ echo memory_get_peak_usage(), "\n"; time ~/dev/php/php-5.3dev/sapi/cli/php -dzend.enable_gc=0 \ - -dmemory_limit=-1 -n Listing1.php + -dmemory_limit=-1 -n Listing1.php # and time ~/dev/php/php-5.3dev/sapi/cli/php -dzend.enable_gc=1 \ -dmemory_limit=-1 -n Listing2.php diff --git a/install/windows/iis7.xml b/install/windows/iis7.xml index 25f7a3f9a3..62463ac936 100644 --- a/install/windows/iis7.xml +++ b/install/windows/iis7.xml @@ -81,7 +81,7 @@ - Configuring IIS to process PHP requests + Configuring IIS to process PHP requests Download and install PHP in accordance to the instructions described in manual installation steps diff --git a/internals2/buildsys/configwin.xml b/internals2/buildsys/configwin.xml index 1bcfddaf90..6b64dee888 100644 --- a/internals2/buildsys/configwin.xml +++ b/internals2/buildsys/configwin.xml @@ -65,8 +65,8 @@ if (PHP_EXAMPLE != "no") { diff --git a/internals2/counter.xml b/internals2/counter.xml index c249ca8355..acd2030ed8 100644 --- a/internals2/counter.xml +++ b/internals2/counter.xml @@ -684,10 +684,10 @@ $counter_four->printCounterInfo(); Counter::setCounterClass changes the class of objects - returned by Counter::getNamed. The class being set - must not have a public constructor and must be a subclass of - Counter. If these conditions are not met, a fatal - error is raised. This is a static function. + returned by Counter::getNamed. The class being set + must not have a public constructor and must be a subclass of + Counter. If these conditions are not met, a fatal + error is raised. This is a static function. diff --git a/internals2/opcodes.xml b/internals2/opcodes.xml index 70d90c7446..53fe51e051 100644 --- a/internals2/opcodes.xml +++ b/internals2/opcodes.xml @@ -22,7 +22,7 @@ Opcode list - + Number Name @@ -1697,7 +1697,7 @@ echo 1 xor 2; */ $x = 0; while(1) { - if($x == 0) break; + if($x == 0) break; } ?> ]]> @@ -1996,14 +1996,14 @@ echo 1^2; $i=0; switch ($i) { case 0: - echo "i=0"; - break; + echo "i=0"; + break; case 1: - echo "i=1"; - break; + echo "i=1"; + break; case 2: - echo "i=2"; - break; + echo "i=2"; + break; } ?> ]]> @@ -2475,9 +2475,9 @@ echo "hello" . "world"; * opcode number: 139 */ class A { - function methodA(){ - echo "hello world"; - } + function methodA(){ + echo "hello world"; + } } ?> ]]> @@ -2627,13 +2627,13 @@ class A{ class Foo { public static $my_static = 'foo'; public function staticValue() { - return self::$my_static; + return self::$my_static; } } class Bar extends Foo { public function fooStatic() { - echo parent::$my_static; + echo parent::$my_static; } } } @@ -3821,11 +3821,11 @@ list($x) = array("X"); */ $a = 1; while($a > 0){ - $a = 0; + $a = 0; } /*$input =array(1,2,3); while (list($var,) = @each($input)){ - unset($$var); + unset($$var); }*/ /*$a = array(1,2,3); $x = 'a'; @@ -4885,7 +4885,7 @@ $$a = 2; */ $a = array(1,2,3); foreach($a as $num){ - print $num; + print $num; } ?> ]]> @@ -5001,7 +5001,7 @@ foreach($a as $num){ */ $a = array(1,2,3); foreach($a as $num){ - print $num; + print $num; } ?> ]]> @@ -5435,7 +5435,7 @@ $a = $x(); */ class A { var $num; - function incrementNum(){ + function incrementNum(){ $num++; } } @@ -5560,7 +5560,7 @@ $obj->incrementNum(); */ class Foo { public static function aStaticMethod() { - echo "hello world\n"; + echo "hello world\n"; } } @@ -6385,7 +6385,7 @@ echo (1 >= 2); * opcode number: 44 */ for($i=0; $i<3; $i++){ - echo "hi"; + echo "hi"; } ?> ]]> @@ -6606,7 +6606,7 @@ if($a != 0) echo "foo"; * opcode number: 45 */ for($i=0; $i<3; $i++){ - echo "hi"; + echo "hi"; } ?> ]]> @@ -7705,13 +7705,13 @@ function B(){ */ abstract class fail { - abstract function show(); + abstract function show(); } class pass extends fail { - function show() { - echo "Call to function show()\n"; - } + function show() { + echo "Call to function show()\n"; + } } $t2 = new pass(); @@ -8178,7 +8178,7 @@ return 1; * opcode number: 65 */ function funcA($msg){ - print $msg; + print $msg; } funcA('HELLO'); @@ -8566,7 +8566,7 @@ echo 1-2; */ $a = array(1,2,3); foreach($a as $num){ - print $num; + print $num; } ?> ]]> @@ -8844,7 +8844,7 @@ profile(); // Run a block of code, throw a tick every 2nd statement declare(ticks=2) { for ($x = 0; $x < 10; ++$x) { - echo "hello world\n"; + echo "hello world\n"; } } ?> diff --git a/internals2/structure/basics.xml b/internals2/structure/basics.xml index 007339e11a..d5f2deee66 100644 --- a/internals2/structure/basics.xml +++ b/internals2/structure/basics.xml @@ -38,11 +38,11 @@ extern zend_module_entry counter_module_entry; #define phpext_counter_ptr &counter_module_entry #ifdef PHP_WIN32 -# define PHP_COUNTER_API __declspec(dllexport) +# define PHP_COUNTER_API __declspec(dllexport) #elif defined(__GNUC__) && __GNUC__ >= 4 -# define PHP_COUNTER_API __attribute__ ((visibility("default"))) +# define PHP_COUNTER_API __attribute__ ((visibility("default"))) #else -# define PHP_COUNTER_API +# define PHP_COUNTER_API #endif #ifdef ZTS diff --git a/language/control-structures/declare.xml b/language/control-structures/declare.xml index 396d33acc3..bd8706c02e 100644 --- a/language/control-structures/declare.xml +++ b/language/control-structures/declare.xml @@ -99,7 +99,7 @@ declare(ticks=1); // A function called on each tick event function tick_handler() { - echo "tick_handler() called\n"; + echo "tick_handler() called\n"; } register_tick_function('tick_handler'); @@ -107,8 +107,8 @@ register_tick_function('tick_handler'); $a = 1; if ($a > 0) { - $a += 2; - print($a); + $a += 2; + print($a); } ?> @@ -132,10 +132,10 @@ $a = 1; tick_handler(); if ($a > 0) { - $a += 2; - tick_handler(); - print($a); - tick_handler(); + $a += 2; + tick_handler(); + print($a); + tick_handler(); } tick_handler(); diff --git a/language/oop5/magic.xml b/language/oop5/magic.xml index b806632e7b..24ea6ba600 100644 --- a/language/oop5/magic.xml +++ b/language/oop5/magic.xml @@ -175,9 +175,9 @@ Hello