php8-mod: DefinitionGlob to specify a pattern for definition files

Author: partikus

src/Definition/Source/DefinitionGlob.php

@@ -4,50 +4,40 @@
 
 namespace DI\Definition\Source;
 
+use DI\Definition\Definition;
+
 /**
  * Reads DI definitions from files matching glob pattern.
  */
 class DefinitionGlob implements DefinitionSource
 {
-    /**
-     * @var bool
-     */
-    private $initialized = false;
+    private bool $initialized = false;
 
-    /**
-     * Glob pattern to files containing definitions.
-     * @var string
-     */
-    private $pattern;
+    private ?Autowiring $autowiring = null;
 
-    /**
-     * @var Autowiring
-     */
-    private $autowiring;
-
-    /**
-     * @var SourceChain
-     */
-    private $sourceChain;
+    private ?SourceChain $sourceChain = null;
 
     /**
      * @param string $pattern Glob pattern to files containing definitions
      */
-    public function __construct(string $pattern)
-    {
-        $this->pattern = $pattern;
+    public function __construct(
+        /**
+         * Glob pattern to files containing definitions.
+         */
+        private string $pattern
+    ) {
     }
 
-    public function setAutowiring(Autowiring $autowiring)
+    public function setAutowiring(Autowiring $autowiring): void
     {
         $this->autowiring = $autowiring;
     }
 
-    public function getDefinition(string $name, int $startIndex = 0)
+    public function getDefinition(string $name): Definition|null
     {
         $this->initialize();
 
-        return $this->sourceChain->getDefinition($name, $startIndex);
+        return $this->sourceChain->getDefinition($name);
     }
 
     public function getDefinitions() : array
@@ -60,18 +50,18 @@ public function getDefinitions() : array
     /**
      * Lazy-loading of the definitions.
      */
-    private function initialize()
+    private function initialize(): void
     {
         if ($this->initialized === true) {
             return;
         }
 
-        $paths = glob($this->pattern, \GLOB_BRACE);
-        $sources = array_map(function ($path) {
-            return new DefinitionFile($path, $this->autowiring);
-        }, $paths);
-        $this->sourceChain = new SourceChain($sources);
+        // prevent errors due to GLOB_BRACE that does not exist e.g. Alpine Linux
+        $flags = defined('GLOB_BRACE') ? GLOB_BRACE : 0;
+        $paths = glob($this->pattern, $flags);
+        $sources = array_map(fn (string $path) => new DefinitionFile($path, $this->autowiring), $paths);
 
+        $this->sourceChain = new SourceChain($sources);
         $this->initialized = true;
     }
 }