fixed compatibility with PHP 5.4

vrana · Jan 6, 2012 · 9f0e286 · 9f0e286
1 parent 53bf820
commit 9f0e286
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tasks/convert52-renamedClasses.php b/tasks/convert52-renamedClasses.php
@@ -20,11 +20,11 @@
 	'Nette\Diagnostics\Helpers' => 'DebugHelpers',
 	'Nette\Diagnostics\Bar' => 'DebugBar',
 	'Nette\Diagnostics\BlueScreen' => 'DebugBlueScreen',
-	'Nette\Iterators\Filter' => 'CallbackFilterIterator',
+	'Nette\Iterators\Filter' => 'NCallbackFilterIterator',
 	'Nette\Iterators\Recursor' => 'GenericRecursiveIterator',
 	'Nette\Iterators\InstanceFilter' => 'InstanceFilterIterator',
 	'Nette\Iterators\Mapper' => 'MapIterator',
-	'Nette\Iterators\RecursiveFilter' => 'RecursiveCallbackFilterIterator',
+	'Nette\Iterators\RecursiveFilter' => 'NRecursiveCallbackFilterIterator',
 	'Nette\Iterators\CachingIterator' => 'SmartCachingIterator',
 	'Nette\Application\Diagnostics\RoutingPanel' => 'RoutingDebugger',
 	'Nette\Application\Request' => 'PresenterRequest',

diff --git a/tasks/convert52.php b/tasks/convert52.php
@@ -12,7 +12,7 @@
 
 	$s = $orig = file_get_contents($file);
 
-	if (strpos($s, '@phpversion 5.3')) { // delete 5.3 files
+	if (strpos($s, '@phpversion 5.3') || strpos($s, '@phpversion 5.4')) { // delete > 5.2
 		unlink($file);
 		return;
 	}

diff --git a/tasks/convert53.php b/tasks/convert53.php
@@ -9,7 +9,7 @@
 $project->convert53 = function($file) {
 	$s = $orig = file_get_contents($file);
 
-	if (strpos($s, '@phpversion < 5.3')) { // delete 5.2 files
+	if (strpos($s, '@phpversion < 5.3') || strpos($s, '@phpversion 5.4')) { // delete non 5.3 files
 		unlink($file);
 		return;
 	}