Merge branch 'cleanup'

Author: lkrms

.php-cs-fixer.dist.php

@@ -59,7 +59,7 @@
             ['template', 'template-covariant'],
             ['extends', 'implements', 'use'],
             ['phpstan-require-extends', 'phpstan-require-implements'],
-            ['readonly', 'var', 'phpstan-var', 'param', 'param-out', 'phpstan-param', 'return', 'phpstan-return', 'throws', 'phpstan-assert*', 'phpstan-ignore-next-line'],
+            ['readonly', 'var', 'phpstan-var', 'param', 'param-out', 'phpstan-param', 'return', 'phpstan-return', 'throws', 'phpstan-assert*', 'phpstan-ignore*', 'disregard'],
             ['phpstan-*'],
         ]],
         'phpdoc_tag_casing' => true,

phpstan-baseline-7.4.neon

@@ -303,6 +303,7 @@ public function run()
     {
         $this->LastExitStatus = 0;
 
+        /** @disregard P1006 */
         $args = array_slice($_SERVER['argv'], 1);
 
         $lastNode = null;

phpstan-baseline-8.3.neon

@@ -538,6 +538,7 @@ final public function startSync(?string $command = null, ?array $arguments = nul
             ));
         }
 
+        /** @disregard P1006 */
         Sync::load(new SyncStore(
             $syncDb,
             $command === null

src/Toolkit/Cli/CliApplication.php

@@ -102,6 +102,7 @@ private function bindContainer(): void
         // Bind interfaces that extend Psr\Container\ContainerInterface
         foreach ($class->getInterfaces() as $name => $interface) {
             if ($interface->implementsInterface(PsrContainerInterface::class)) {
+                /** @disregard P1006 */
                 $this->instance($name, $this);
             }
         }

src/Toolkit/Container/Application.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+
+namespace Salient\Contract\Core;
+
+use ArrayAccess;
+use ReturnTypeWillChange;
+
+/**
+ * Provides a standard interface to an underlying object or array and its values
+ *
+ * @api
+ *
+ * @extends ArrayAccess<array-key,mixed>
+ */
+interface GraphInterface extends ArrayAccess
+{
+    /**
+     * @param mixed[]|object $value
+     */
+    public function __construct(&$value = []);
+
+    /**
+     * Get the underlying object or array
+     *
+     * @return mixed[]|object
+     */
+    public function getValue();
+
+    /**
+     * Get the properties or keys traversed to reach the current value
+     *
+     * @return array<array-key>
+     */
+    public function getPath(): array;
+
+    /**
+     * Get the value at the given offset
+     *
+     * If the value is an object or array, a new instance of the class is
+     * returned to service it, otherwise the value itself is returned.
+     *
+     * @return static|resource|int|float|string|bool|null
+     * @disregard P1038
+     */
+    #[ReturnTypeWillChange]
+    public function offsetGet($offset);
+}

src/Toolkit/Container/Container.php

@@ -84,8 +84,11 @@ private static function loadServiceList(): void
             return;
         }
 
+        /** @disregard P1008 */
         self::doLoadServiceList($serviceName, $serviceList);
+        /** @disregard P1008 */
         self::$ServiceNames[static::class] = $serviceName;
+        /** @disregard P1008 */
         self::$ServiceLists[static::class] = $serviceList;
         self::$LoadedServices[static::class] = true;
     }

src/Toolkit/Contract/Core/GraphInterface.php

@@ -137,6 +137,7 @@ public function offsetExists($offset): bool
      *
      * @param string $offset
      * @return mixed
+     * @disregard P1038
      */
     #[ReturnTypeWillChange]
     public function offsetGet($offset)