Make internal classes final and additional return types

pierredup · pierredup · commit de386b2aa3e2 · 2020-03-26T08:58:30.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Tests/Fixtures/ChangeFileResource.php b/src/Symfony/Component/Filesystem/Tests/Fixtures/ChangeFileResource.php
@@ -17,7 +17,7 @@
 /**
  * @author Pierre du Plessis <pdples@gmail.com>
  */
-class ChangeFileResource implements ResourceInterface
+final class ChangeFileResource implements ResourceInterface
 {
     private $path;
 
diff --git a/src/Symfony/Component/Filesystem/Watcher/FileChangeEvent.php b/src/Symfony/Component/Filesystem/Watcher/FileChangeEvent.php
@@ -14,7 +14,7 @@
 /**
  * @author Pierre du Plessis <pdples@gmail.com>
  */
-class FileChangeEvent
+final class FileChangeEvent
 {
     public const FILE_CHANGED = 1;
     public const FILE_DELETED = 2;
diff --git a/src/Symfony/Component/Filesystem/Watcher/FileChangeWatcher.php b/src/Symfony/Component/Filesystem/Watcher/FileChangeWatcher.php
@@ -18,7 +18,7 @@
  *
  * @internal
  */
-class FileChangeWatcher implements WatcherInterface
+final class FileChangeWatcher implements WatcherInterface
 {
     private $locator;
 
@@ -27,7 +27,7 @@ public function __construct()
         $this->locator = new FileResourceLocator();
     }
 
-    public function watch($path, callable $callback, float $timeout = null)
+    public function watch($path, callable $callback, float $timeout = null): void
     {
         $resource = $this->locator->locate($path);
 
diff --git a/src/Symfony/Component/Filesystem/Watcher/INotifyWatcher.php b/src/Symfony/Component/Filesystem/Watcher/INotifyWatcher.php
@@ -18,9 +18,9 @@
  *
  * @internal
  */
-class INotifyWatcher implements WatcherInterface
+final class INotifyWatcher implements WatcherInterface
 {
-    public function watch($path, callable $callback, float $timeout = null)
+    public function watch($path, callable $callback, float $timeout = null): void
     {
         $inotifyInit = inotify_init();
 
@@ -90,7 +90,7 @@ public function watch($path, callable $callback, float $timeout = null)
         }
     }
 
-    private function scanPath($path)
+    private function scanPath($path): iterable
     {
         foreach (glob($path, GLOB_ONLYDIR) as $directory) {
             yield $directory;
diff --git a/src/Symfony/Component/Filesystem/Watcher/Resource/ArrayResource.php b/src/Symfony/Component/Filesystem/Watcher/Resource/ArrayResource.php
@@ -16,7 +16,7 @@
  *
  * @internal
  */
-class ArrayResource implements ResourceInterface
+final class ArrayResource implements ResourceInterface
 {
     /**
      * @var ResourceInterface[]
diff --git a/src/Symfony/Component/Filesystem/Watcher/Resource/DirectoryResource.php b/src/Symfony/Component/Filesystem/Watcher/Resource/DirectoryResource.php
@@ -18,7 +18,7 @@
  *
  * @internal
  */
-class DirectoryResource implements ResourceInterface
+final class DirectoryResource implements ResourceInterface
 {
     private $dir;
 
diff --git a/src/Symfony/Component/Filesystem/Watcher/Resource/FileResource.php b/src/Symfony/Component/Filesystem/Watcher/Resource/FileResource.php
@@ -18,7 +18,7 @@
  *
  * @internal
  */
-class FileResource implements ResourceInterface
+final class FileResource implements ResourceInterface
 {
     private $file;
 
diff --git a/src/Symfony/Component/Filesystem/Watcher/Resource/Locator/FileResourceLocator.php b/src/Symfony/Component/Filesystem/Watcher/Resource/Locator/FileResourceLocator.php
@@ -22,7 +22,7 @@
  *
  * @internal
  */
-class FileResourceLocator
+final class FileResourceLocator
 {
     public function locate($path): ?ResourceInterface
     {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* @author Pierre du Plessis <pdples@gmail.com>`
`19`	`19`	`*/`
`20`		`-class ChangeFileResource implements ResourceInterface`
	`20`	`+final class ChangeFileResource implements ResourceInterface`
`21`	`21`	`{`
`22`	`22`	`private $path;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* @author Pierre du Plessis <pdples@gmail.com>`
`16`	`16`	`*/`
`17`		`-class FileChangeEvent`
	`17`	`+final class FileChangeEvent`
`18`	`18`	`{`
`19`	`19`	`public const FILE_CHANGED = 1;`
`20`	`20`	`public const FILE_DELETED = 2;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* @internal`
`20`	`20`	`*/`
`21`		`-class FileChangeWatcher implements WatcherInterface`
	`21`	`+final class FileChangeWatcher implements WatcherInterface`
`22`	`22`	`{`
`23`	`23`	`private $locator;`
`24`	`24`
`@@ -27,7 +27,7 @@ public function __construct()`
`27`	`27`	`$this->locator = new FileResourceLocator();`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function watch($path, callable $callback, float $timeout = null)`
	`30`	`+ public function watch($path, callable $callback, float $timeout = null): void`
`31`	`31`	`{`
`32`	`32`	`$resource = $this->locator->locate($path);`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@`
`18`	`18`	`*`
`19`	`19`	`* @internal`
`20`	`20`	`*/`
`21`		`-class INotifyWatcher implements WatcherInterface`
	`21`	`+final class INotifyWatcher implements WatcherInterface`
`22`	`22`	`{`
`23`		`- public function watch($path, callable $callback, float $timeout = null)`
	`23`	`+ public function watch($path, callable $callback, float $timeout = null): void`
`24`	`24`	`{`
`25`	`25`	`$inotifyInit = inotify_init();`
`26`	`26`
`@@ -90,7 +90,7 @@ public function watch($path, callable $callback, float $timeout = null)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- private function scanPath($path)`
	`93`	`+ private function scanPath($path): iterable`
`94`	`94`	`{`
`95`	`95`	`foreach (glob($path, GLOB_ONLYDIR) as $directory) {`
`96`	`96`	`yield $directory;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* @internal`
`18`	`18`	`*/`
`19`		`-class ArrayResource implements ResourceInterface`
	`19`	`+final class ArrayResource implements ResourceInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @var ResourceInterface[]`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @internal`
`24`	`24`	`*/`
`25`		`-class FileResourceLocator`
	`25`	`+final class FileResourceLocator`
`26`	`26`	`{`
`27`	`27`	`public function locate($path): ?ResourceInterface`
`28`	`28`	`{`