Remove name unicity constraint, add phpdoc, refactor time computation

twigphp · Dec 10, 2023 · 6c5f9c6 · 6c5f9c6
1 parent 3d86571
commit 6c5f9c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/src/Extension/AttributeExtension.php b/src/Extension/AttributeExtension.php
@@ -47,7 +47,7 @@ public function getLastModified(): int
 
         foreach ($this->objectsOrClasses as $objectOrClass) {
             $r = new \ReflectionClass($objectOrClass);
-            if (is_file($r->getFileName()) && ($extensionTime = filemtime($r->getFileName())) > $lastModified) {
+            if (is_file($r->getFileName()) && $lastModified < $extensionTime = filemtime($r->getFileName())) {
                 $lastModified = $extensionTime;
             }
         }
@@ -99,10 +99,6 @@ private function initFromAttributes()
                     $attribute = $attribute->newInstance();
 
                     $name = $attribute->name;
-                    if (isset($filters[$name])) {
-                        throw new \LogicException(sprintf('Multiple definitions of the "%s" filter.', $name));
-                    }
-
                     $parameters = $method->getParameters();
                     $needsEnvironment = isset($parameters[0]) && Environment::class === $parameters[0]->getType()?->getName();
                     $firstParam = $needsEnvironment ? 1 : 0;
@@ -128,10 +124,6 @@ private function initFromAttributes()
                     $attribute = $attribute->newInstance();
 
                     $name = $attribute->name;
-                    if (isset($functions[$name])) {
-                        throw new \LogicException(sprintf('Multiple definitions of the "%s" function.', $name));
-                    }
-
                     $parameters = $method->getParameters();
                     $needsEnvironment = isset($parameters[0]) && Environment::class === $parameters[0]->getType()?->getName();
                     $firstParam = $needsEnvironment ? 1 : 0;
@@ -155,10 +147,6 @@ private function initFromAttributes()
                     $attribute = $attribute->newInstance();
 
                     $name = $attribute->name;
-                    if (isset($tests[$name])) {
-                        throw new \LogicException(sprintf('Multiple definitions of the "%s" test.', $name));
-                    }
-
                     $parameters = $method->getParameters();
                     $isVariadic = isset($parameters[$firstParam]) && end($parameters)->isVariadic();
 

diff --git a/src/Extension/WithLastModified.php b/src/Extension/WithLastModified.php
@@ -2,7 +2,14 @@
 
 namespace Twig\Extension;
 
+/**
+ * Freshness of templates use the last modification date of each extension class.
+ * Implement this interface to provide a different last modification date.
+ */
 interface WithLastModified
 {
+    /**
+     * @return int A UNIX timestamp
+     */
     public function getLastModified(): int;
 }
diff --git a/src/ExtensionSet.php b/src/ExtensionSet.php
@@ -113,10 +113,10 @@ public function getLastModified(): int
 
         foreach ($this->extensions as $extension) {
             $r = new \ReflectionObject($extension);
-            if (is_file($r->getFileName()) && ($extensionTime = filemtime($r->getFileName())) > $this->lastModified) {
+            if (is_file($r->getFileName()) && $this->lastModified < $extensionTime = filemtime($r->getFileName())) {
                 $this->lastModified = $extensionTime;
             }
-            if ($extension instanceof WithLastModified && ($extensionTime = $extension->getLastModified()) > $this->lastModified) {
+            if ($extension instanceof WithLastModified && $this->lastModified < $extensionTime = $extension->getLastModified()) {
                 $this->lastModified = $extensionTime;
             }
         }