removed support for PHP 5.3

nette · May 21, 2015 · 6ec9057 · 6ec9057
1 parent 2a9619e
commit 6ec9057
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 83 deletions.
diff --git a/src/Finder/CallbackFilterIterator.php b/src/Finder/CallbackFilterIterator.php
diff --git a/src/Finder/Finder.php b/src/Finder/Finder.php
@@ -232,8 +232,7 @@ private function buildIterator($path)
 
 		if ($this->exclude) {
 			$filters = $this->exclude;
-			$iterator = new RecursiveCallbackFilterIterator($iterator, function($foo, $bar, RecursiveCallbackFilterIterator $iterator) use ($filters) {
+			$iterator = new \RecursiveCallbackFilterIterator($iterator, function($foo, $bar, \RecursiveDirectoryIterator $file) use ($filters) {
-				$file = $iterator->getInnerIterator();
 				if (!$file->isDot() && !$file->isFile()) {
 					foreach ($filters as $filter) {
 						if (!call_user_func($filter, $file)) {
@@ -252,10 +251,10 @@ private function buildIterator($path)
 
 		if ($this->groups) {
 			$groups = $this->groups;
-			$iterator = new CallbackFilterIterator($iterator, function($foo, $bar, CallbackFilterIterator $file) use ($groups) {
+			$iterator = new \CallbackFilterIterator($iterator, function($foo, $bar, \Iterator $file) use ($groups) {
-				do {
+				while ($file instanceof \OuterIterator) {
 					$file = $file->getInnerIterator();
-				} while (!$file instanceof FilesystemIterator);
+				}
 
 				foreach ($groups as $filters) {
 					foreach ($filters as $filter) {
@@ -339,7 +338,7 @@ public function size($operator, $size = NULL)
 			$operator = $operator ? $operator : '=';
 		}
 		return $this->filter(function(FilesystemIterator $file) use ($operator, $size) {
-			return Finder::compare($file->getSize(), $operator, $size);
+			return self::compare($file->getSize(), $operator, $size);
 		});
 	}
 
@@ -361,7 +360,7 @@ public function date($operator, $date = NULL)
 		}
 		$date = DateTime::from($date)->format('U');
 		return $this->filter(function(FilesystemIterator $file) use ($operator, $date) {
-			return Finder::compare($file->getMTime(), $operator, $date);
+			return self::compare($file->getMTime(), $operator, $date);
 		});
 	}
 

diff --git a/src/Finder/RecursiveCallbackFilterIterator.php b/src/Finder/RecursiveCallbackFilterIterator.php