From 413b9017e587f1bc6b01bdd779361eedbee63e38 Mon Sep 17 00:00:00 2001 From: Igor Simdyanov Date: Fri, 5 Aug 2022 09:50:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BB=D0=B0=D0=B2=D0=B0=2038:=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D1=83=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iterators/array_access.php | 3 ++- iterators/directory.php | 2 +- iterators/filter.php | 2 +- iterators/iterator.php | 3 ++- iterators/iterator_aggregate.php | 3 ++- iterators/iterators/fsdirectoryiterator.php | 5 +++-- iterators/iterators/limitmyiterator.php | 4 +++- iterators/limit.php | 2 +- iterators/recursion_dir.php | 2 +- iterators/size.php | 2 +- iterators/use_array_object.php | 2 +- iterators/use_limitmyiterator.php | 2 +- iterators/use_myiterator.php | 2 +- 13 files changed, 20 insertions(+), 14 deletions(-) diff --git a/iterators/array_access.php b/iterators/array_access.php index 0d263b4..f61a88c 100644 --- a/iterators/array_access.php +++ b/iterators/array_access.php @@ -1,5 +1,6 @@ '; } diff --git a/iterators/filter.php b/iterators/filter.php index 0b28156..69cbb46 100644 --- a/iterators/filter.php +++ b/iterators/filter.php @@ -6,6 +6,6 @@ $filter = new Iterators\ExtensionFilter( 'php' ); -foreach($filter as $file) { +foreach ($filter as $file) { echo $file . '
'; } diff --git a/iterators/iterator.php b/iterators/iterator.php index 3683b36..b7d7970 100644 --- a/iterators/iterator.php +++ b/iterators/iterator.php @@ -1,5 +1,6 @@ rewind(); } //* - //* Далее идут переопределения виртуальных методов интерфейса Iterator + //* Переопределения виртуальных методов интерфейса Iterator //* // Устанавливает итератор на первый элемент public function rewind() : void @@ -28,7 +28,8 @@ class FSDirectoryIterator implements \Iterator // Проверяет, не закончились ли уже элементы public function valid() : bool { - // readdir() возвращает false, когда элементы каталога закончились + // readdir() возвращает false, + // когда элементы каталога закончились return $this->cur !== false; } // Возвращает текущий ключ diff --git a/iterators/iterators/limitmyiterator.php b/iterators/iterators/limitmyiterator.php index e408f88..e63243e 100644 --- a/iterators/iterators/limitmyiterator.php +++ b/iterators/iterators/limitmyiterator.php @@ -3,7 +3,9 @@ namespace Iterators; class LimitMyIterator implements \IteratorAggregate { - public function __construct(private array $collection, private int $limit = 2) + public function __construct( + private array $collection, + private int $limit = 2) {} public function getIterator() : \Traversable diff --git a/iterators/limit.php b/iterators/limit.php index f5edfc9..3b8600a 100644 --- a/iterators/limit.php +++ b/iterators/limit.php @@ -8,6 +8,6 @@ $limit = new LimitIterator( 0, 5); -foreach($limit as $file) { +foreach ($limit as $file) { echo $file . '
'; } diff --git a/iterators/recursion_dir.php b/iterators/recursion_dir.php index e9597ed..c31ac56 100644 --- a/iterators/recursion_dir.php +++ b/iterators/recursion_dir.php @@ -4,7 +4,7 @@ function recursion_dir($path) static $depth = 0; $dir = opendir($path); - while(($file = readdir($dir)) !== false) { + while (($file = readdir($dir)) !== false) { if ($file == '.' || $file == '..' ) continue; echo str_repeat('-', $depth)." $file
"; diff --git a/iterators/size.php b/iterators/size.php index b548280..3f91853 100644 --- a/iterators/size.php +++ b/iterators/size.php @@ -1,7 +1,7 @@ isFile()) { echo $file . ' ' .$file->getSize() . '
'; } diff --git a/iterators/use_array_object.php b/iterators/use_array_object.php index 89f78c8..b7c6bad 100644 --- a/iterators/use_array_object.php +++ b/iterators/use_array_object.php @@ -10,6 +10,6 @@ $collection = new ArrayObject($array); echo $collection[2]; // третий echo '
'; -foreach($collection as $key => $value) { +foreach ($collection as $key => $value) { echo "Элемент с индексом $key и значением $value
"; } diff --git a/iterators/use_limitmyiterator.php b/iterators/use_limitmyiterator.php index 20db609..231cb2d 100644 --- a/iterators/use_limitmyiterator.php +++ b/iterators/use_limitmyiterator.php @@ -9,6 +9,6 @@ $array = ['первый', $collection = new Iterators\LimitMyIterator($array); -foreach($collection as $key => $value) { +foreach ($collection as $key => $value) { echo "Элемент с индексом $key и значением $value
"; } diff --git a/iterators/use_myiterator.php b/iterators/use_myiterator.php index eed3a77..942eb61 100644 --- a/iterators/use_myiterator.php +++ b/iterators/use_myiterator.php @@ -9,6 +9,6 @@ $array = ['первый', $collection = new Iterators\MyIterator($array); -foreach($collection as $key => $value) { +foreach ($collection as $key => $value) { echo "Элемент с индексом $key и значением $value
"; }