Revert "merged branch everzet/config-additions-from-rw (PR symfony#4619)"

This reverts commit 041286e, reversing changes made to 4c8ea31.

Author: fabpot

src/Symfony/Component/Config/Resource/DirectoryResource.php

@@ -16,7 +16,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class DirectoryResource implements ResourceInterface
+class DirectoryResource implements ResourceInterface, \Serializable
 {
  private $resource;
  private $pattern;
@@ -33,82 +33,6 @@ public function __construct($resource, $pattern = null)
  $this->pattern = $pattern;
  }
 
- /**
- * Returns the list of filtered file and directory childs of directory resource.
- *
- * @return array An array of files
- */
- public function getFilteredChilds()
- {
- if (!$this->exists()) {
- return array();
- }
-
- $iterator = new \RecursiveIteratorIterator(
- new \RecursiveDirectoryIterator($this->resource, \FilesystemIterator::SKIP_DOTS),
- \RecursiveIteratorIterator::SELF_FIRST
- );
-
- $childs = array();
- foreach ($iterator as $file) {
- // if regex filtering is enabled only return matching files
- if ($file->isFile() && !$this->hasFile($file)) {
- continue;
- }
-
- // always monitor directories for changes, except the .. entries
- // (otherwise deleted files wouldn't get detected)
- if ($file->isDir() && '/..' === substr($file, -3)) {
- continue;
- }
-
- $childs[] = $file;
- }
-
- return $childs;
- }
-
- /**
- * Returns child resources that matches directory filters.
- *
- * @return array
- */
- public function getFilteredResources()
- {
- if (!$this->exists()) {
- return array();
- }
-
- $iterator = new \DirectoryIterator($this->resource);
-
- $resources = array();
- foreach ($iterator as $file) {
- // if regex filtering is enabled only return matching files
- if ($file->isFile() && !$this->hasFile($file)) {
- continue;
- }
-
- // always monitor directories for changes, except the .. entries
- // (otherwise deleted files wouldn't get detected)
- if ($file->isDir() && '/..' === substr($file, -3)) {
- continue;
- }
-
- // if file is dot - continue
- if ($file->isDot()) {
- continue;
- }
-
- if ($file->isFile()) {
- $resources[] = new FileResource($file->getRealPath());
- } elseif ($file->isDir()) {
- $resources[] = new DirectoryResource($file->getRealPath());
- }
- }
-
- return $resources;
- }
-
  /**
  * Returns a string representation of the Resource.
  *
@@ -129,62 +53,11 @@ public function getResource()
  return $this->resource;
  }
 
- /**
- * Returns check pattern.
- *
- * @return mixed
- */
  public function getPattern()
  {
  return $this->pattern;
  }
 
- /**
- * Checks that passed file exists in resource and matches resource filters.
- *
- * @param SplFileInfo|string $file
- *
- * @return Boolean
- */
- public function hasFile($file)
- {
- if (!$file instanceof \SplFileInfo) {
- $file = new \SplFileInfo($file);
- }
-
- if (0 !== strpos($file->getRealPath(), realpath($this->resource))) {
- return false;
- }
-
- if ($this->pattern) {
- return (bool) preg_match($this->pattern, $file->getBasename());
- }
-
- return true;
- }
-
- /**
- * Returns resource mtime.
- *
- * @return integer
- */
- public function getModificationTime()
- {
- if (!$this->exists()) {
- return -1;
- }
-
- clearstatcache(true, $this->resource);
- $newestMTime = filemtime($this->resource);
-
- foreach ($this->getFilteredChilds() as $file) {
- clearstatcache(true, (string) $file);
- $newestMTime = max($file->getMTime(), $newestMTime);
- }
-
- return $newestMTime;
- }
-
  /**
  * Returns true if the resource has not been updated since the given timestamp.
  *
@@ -194,31 +67,27 @@ public function getModificationTime()
  */
  public function isFresh($timestamp)
  {
- if (!$this->exists()) {
+ if (!is_dir($this->resource)) {
  return false;
  }
 
- return $this->getModificationTime() < $timestamp;
- }
+ $newestMTime = filemtime($this->resource);
+ foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->resource), \RecursiveIteratorIterator::SELF_FIRST) as $file) {
+ // if regex filtering is enabled only check matching files
+ if ($this->pattern && $file->isFile() && !preg_match($this->pattern, $file->getBasename())) {
+ continue;
+ }
 
- /**
- * Returns true if the resource exists in the filesystem.
- *
- * @return Boolean
- */
- public function exists()
- {
- return is_dir($this->resource);
- }
+ // always monitor directories for changes, except the .. entries
+ // (otherwise deleted files wouldn't get detected)
+ if ($file->isDir() && '/..' === substr($file, -3)) {
+ continue;
+ }
 
- /**
- * Returns unique resource ID.
- *
- * @return string
- */
- public function getId()
- {
- return md5('d'.$this->resource.$this->pattern);
+ $newestMTime = max($file->getMTime(), $newestMTime);
+ }
+
+ return $newestMTime < $timestamp;
  }
 
  public function serialize()

src/Symfony/Component/Config/Resource/FileResource.php

@@ -18,7 +18,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class FileResource implements ResourceInterface
+class FileResource implements ResourceInterface, \Serializable
 {
  private $resource;
 
@@ -29,7 +29,7 @@ class FileResource implements ResourceInterface
  */
  public function __construct($resource)
  {
- $this->resource = file_exists($resource) ? realpath($resource) : $resource;
+ $this->resource = realpath($resource);
  }
 
  /**
@@ -52,22 +52,6 @@ public function getResource()
  return $this->resource;
  }
 
- /**
- * Returns resource mtime.
- *
- * @return integer
- */
- public function getModificationTime()
- {
- if (!$this->exists()) {
- return -1;
- }
-
- clearstatcache(true, $this->resource);
-
- return filemtime($this->resource);
- }
-
  /**
  * Returns true if the resource has not been updated since the given timestamp.
  *
@@ -77,31 +61,11 @@ public function getModificationTime()
  */
  public function isFresh($timestamp)
  {
- if (!$this->exists()) {
+ if (!file_exists($this->resource)) {
  return false;
  }
 
- return $this->getModificationTime() <= $timestamp;
- }
-
- /**
- * Returns true if the resource exists in the filesystem.
- *
- * @return Boolean
- */
- public function exists()
- {
- return is_file($this->resource);
- }
-
- /**
- * Returns unique resource ID.
- *
- * @return string
- */
- public function getId()
- {
- return md5('f'.$this->resource);
+ return filemtime($this->resource) < $timestamp;
  }
 
  public function serialize()

src/Symfony/Component/Config/Resource/ResourceInterface.php

@@ -16,7 +16,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-interface ResourceInterface extends \Serializable
+interface ResourceInterface
 {
  /**
  * Returns a string representation of the Resource.
@@ -34,31 +34,10 @@ function __toString();
  */
  function isFresh($timestamp);
 
- /**
- * Returns resource mtime.
- *
- * @return integer
- */
- function getModificationTime();
-
- /**
- * Returns true if the resource exists in the filesystem.
- *
- * @return Boolean
- */
- function exists();
-
  /**
  * Returns the resource tied to this Resource.
  *
  * @return mixed The resource
  */
  function getResource();
-
- /**
- * Returns unique resource ID.
- *
- * @return string
- */
- function getId();
 }