Remove deprecated code and related code cleanup

- `Logger` - `Processors/InheritProperties' - `Processors/InheritTraits' - `Processors/MergeTraits' - functions.php (includes UNDEFINED consts) - processor list related code in `Analysis`
zircote · Sep 7, 2021 · a953cb5 · a953cb5
1 parent a020a41
commit a953cb5
Show file tree

Hide file tree

Showing 42 changed files with 218 additions and 685 deletions.
diff --git a/Examples/processors/schema-query-parameter/scan.php b/Examples/processors/schema-query-parameter/scan.php
@@ -4,9 +4,11 @@
 // also load our custom processor...
 require __DIR__ . '/SchemaQueryParameter.php';
 
+$generator = new OpenApi\Generator();
+
 // merge our custom processor
 $processors = [];
-foreach (\OpenApi\Analysis::processors() as $processor) {
+foreach ($generator->getProcessors() as $processor) {
     $processors[] = $processor;
     if ($processor instanceof \OpenApi\Processors\BuildPaths) {
         $processors[] = new \SchemaQueryParameterProcessor\SchemaQueryParameter();
@@ -17,7 +19,7 @@
     'processors' => $processors,
 ];
 
-$openapi = (new OpenApi\Generator())
+$openapi = $generator
             ->setProcessors($processors)
             ->generate([__DIR__ . '/app']);
 $spec = json_encode($openapi, JSON_PRETTY_PRINT);

diff --git a/composer.json b/composer.json
@@ -50,10 +50,7 @@
   "autoload": {
     "psr-4": {
       "OpenApi\\": "src"
-    },
-    "files": [
-      "src/functions.php"
-    ]
+    }
   },
   "require-dev": {
     "composer/package-versions-deprecated": "1.11.99.2",

diff --git a/src/Analysis.php b/src/Analysis.php
@@ -9,20 +9,6 @@
 use OpenApi\Annotations\AbstractAnnotation;
 use OpenApi\Annotations\OpenApi;
 use OpenApi\Annotations\Schema;
-use OpenApi\Processors\AugmentParameters;
-use OpenApi\Processors\AugmentProperties;
-use OpenApi\Processors\AugmentSchemas;
-use OpenApi\Processors\BuildPaths;
-use OpenApi\Processors\CleanUnmerged;
-use OpenApi\Processors\DocBlockDescriptions;
-use OpenApi\Processors\ExpandInterfaces;
-use OpenApi\Processors\ExpandClasses;
-use OpenApi\Processors\ExpandTraits;
-use OpenApi\Processors\MergeIntoComponents;
-use OpenApi\Processors\MergeIntoOpenApi;
-use OpenApi\Processors\MergeJsonContent;
-use OpenApi\Processors\MergeXmlContent;
-use OpenApi\Processors\OperationId;
 
 /**
  * Result of the analyser.
@@ -430,10 +416,6 @@ public function split()
      */
     public function process($processors = null): void
     {
-        if ($processors === null) {
-            // Use the default and registered processors.
-            $processors = self::processors();
-        }
         if (is_array($processors) === false && is_callable($processors)) {
             $processors = [$processors];
         }
@@ -442,67 +424,6 @@ public function process($processors = null): void
         }
     }
 
-    /**
-     * Get direct access to the processors array.
-     *
-     * @return array reference
-     *
-     * @deprecated Superseded by `Generator` methods
-     */
-    public static function &processors()
-    {
-        if (!self::$processors) {
-            // Add default processors.
-            self::$processors = [
-                new DocBlockDescriptions(),
-                new MergeIntoOpenApi(),
-                new MergeIntoComponents(),
-                new ExpandClasses(),
-                new ExpandInterfaces(),
-                new ExpandTraits(),
-                new AugmentSchemas(),
-                new AugmentProperties(),
-                new BuildPaths(),
-                new AugmentParameters(),
-                new MergeJsonContent(),
-                new MergeXmlContent(),
-                new OperationId(),
-                new CleanUnmerged(),
-            ];
-        }
-
-        return self::$processors;
-    }
-
-    /**
-     * Register a processor.
-     *
-     * @param \Closure $processor
-     *
-     * @deprecated Superseded by `Generator` methods
-     */
-    public static function registerProcessor($processor): void
-    {
-        array_push(self::processors(), $processor);
-    }
-
-    /**
-     * Unregister a processor.
-     *
-     * @param \Closure $processor
-     *
-     * @deprecated Superseded by `Generator` methods
-     */
-    public static function unregisterProcessor($processor): void
-    {
-        $processors = &self::processors();
-        $key = array_search($processor, $processors, true);
-        if ($key === false) {
-            throw new \Exception('Given processor was not registered');
-        }
-        unset($processors[$key]);
-    }
-
     public function validate(): bool
     {
         if ($this->openapi !== null) {

diff --git a/src/Generator.php b/src/Generator.php
@@ -11,6 +11,20 @@
 use OpenApi\Analysers\TokenAnalyser;
 use OpenApi\Annotations\OpenApi;
 use OpenApi\Loggers\DefaultLogger;
+use OpenApi\Processors\AugmentParameters;
+use OpenApi\Processors\AugmentProperties;
+use OpenApi\Processors\AugmentSchemas;
+use OpenApi\Processors\BuildPaths;
+use OpenApi\Processors\CleanUnmerged;
+use OpenApi\Processors\DocBlockDescriptions;
+use OpenApi\Processors\ExpandClasses;
+use OpenApi\Processors\ExpandInterfaces;
+use OpenApi\Processors\ExpandTraits;
+use OpenApi\Processors\MergeIntoComponents;
+use OpenApi\Processors\MergeIntoOpenApi;
+use OpenApi\Processors\MergeJsonContent;
+use OpenApi\Processors\MergeXmlContent;
+use OpenApi\Processors\OperationId;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -128,7 +142,26 @@ public function setAnalyser(?AnalyserInterface $analyser): Generator
      */
     public function getProcessors(): array
     {
-        return null !== $this->processors ? $this->processors : Analysis::processors();
+        if (null === $this->processors) {
+            $this->processors = [
+                new DocBlockDescriptions(),
+                new MergeIntoOpenApi(),
+                new MergeIntoComponents(),
+                new ExpandClasses(),
+                new ExpandInterfaces(),
+                new ExpandTraits(),
+                new AugmentSchemas(),
+                new AugmentProperties(),
+                new BuildPaths(),
+                new AugmentParameters(),
+                new MergeJsonContent(),
+                new MergeXmlContent(),
+                new OperationId(),
+                new CleanUnmerged(),
+            ];
+        }
+
+        return $this->processors;
     }
 
     /**

diff --git a/src/Logger.php b/src/Logger.php
diff --git a/src/Loggers/DefaultLogger.php b/src/Loggers/DefaultLogger.php
@@ -6,7 +6,6 @@
 
 namespace OpenApi\Loggers;
 
-use OpenApi\Logger;
 use Psr\Log\AbstractLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -15,11 +14,16 @@ class DefaultLogger extends AbstractLogger implements LoggerInterface
 {
     public function log($level, $message, array $context = [])
     {
-        // BC: delegate to the static instance
+        if ($message instanceof \Exception) {
+            $message = $message->getMessage();
+        }
+
         if (in_array($level, [LogLevel::NOTICE, LogLevel::INFO, LogLevel::DEBUG])) {
-            Logger::notice($message);
+            $error_level = E_USER_NOTICE;
         } else {
-            Logger::warning($message);
+            $error_level = E_USER_WARNING;
         }
+
+        trigger_error($message, $error_level);
     }
 }