From 2b5372ed1fa726626c48c2547da8c47b668a99de Mon Sep 17 00:00:00 2001
From: Sergey Surkov <dissonancephp@gmail.com>
Date: Tue, 31 Aug 2021 00:25:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B0=D0=B2=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D1=81?=
 =?UTF-8?q?=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BB=D0=BE=D0=B0=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=B7=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0,=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json    |   4 +-
 src/autoload.php |   3 +
 src/vendors.php  | 154 +++++++++--------------------------------------
 3 files changed, 33 insertions(+), 128 deletions(-)
 create mode 100644 src/autoload.php

diff --git a/composer.json b/composer.json
index e4a3682..1ec1dee 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "symbiotic/full-single",
   "description": "Full Symbiotic framework in single file.",
   "license": "BSD-3-Clause",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "authors": [{
     "name": "Surkov Sergey",
     "role": "creator"
@@ -27,7 +27,7 @@
   },
   "autoload": {
     "files": [
-      "src/symbiotic.php"
+      "src/autoload.php"
     ]
   },
   "suggest": {
diff --git a/src/autoload.php b/src/autoload.php
new file mode 100644
index 0000000..3d0ee84
--- /dev/null
+++ b/src/autoload.php
@@ -0,0 +1,3 @@
+<?php
+include_once __DIR__ .'/vendors.php';
+include_once __DIR__.'/symbiotic.php';
\ No newline at end of file
diff --git a/src/vendors.php b/src/vendors.php
index a5544b3..2eeceaa 100644
--- a/src/vendors.php
+++ b/src/vendors.php
@@ -1,169 +1,96 @@
 <?php
 /**
  * Все свое ношу с собой, для работы без композера
+ * Методы очищены чтобы не было конфликтов 
  */
 namespace Psr\Container {
     if (!interface_exists(ContainerExceptionInterface::class)) {
-        interface ContainerExceptionInterface
-        {
-        }
+        interface ContainerExceptionInterface {}
     }
-
     if (!interface_exists(ContainerInterface::class)) {
-        interface ContainerInterface
-        {
-        }
+        interface ContainerInterface {}
     }
-
     if (!interface_exists(NotFoundExceptionInterface::class)) {
-        interface NotFoundExceptionInterface extends ContainerExceptionInterface
-        {
-        }
+        interface NotFoundExceptionInterface extends ContainerExceptionInterface {}
     }
-
 }
-
 namespace Psr\EventDispatcher {
-
     if (!interface_exists(EventDispatcherInterface::class)) {
-        interface EventDispatcherInterface
-        {
-        }
+        interface EventDispatcherInterface {}
     }
     if (!interface_exists(ListenerProviderInterface::class)) {
-        interface ListenerProviderInterface
-        {
-        }
+        interface ListenerProviderInterface {}
     }
     if (!interface_exists(StoppableEventInterface::class)) {
-        interface StoppableEventInterface
-        {
-        }
+        interface StoppableEventInterface {}
     }
-
 }
-
 namespace Psr\Http\Message {
-
     if (!interface_exists(RequestFactoryInterface::class)) {
-        interface RequestFactoryInterface
-        {
-        }
+        interface RequestFactoryInterface {}
     }
-
     if (!interface_exists(ResponseFactoryInterface::class)) {
-        interface ResponseFactoryInterface
-        {
-        }
+        interface ResponseFactoryInterface {}
     }
-
     if (!interface_exists(ServerRequestFactoryInterface::class)) {
-        interface ServerRequestFactoryInterface
-        {
-        }
+        interface ServerRequestFactoryInterface {}
     }
-
     if (!interface_exists(StreamFactoryInterface::class)) {
-        interface StreamFactoryInterface
-        {
-        }
+        interface StreamFactoryInterface {}
     }
-
     if (!interface_exists(UploadedFileFactoryInterface::class)) {
-        interface UploadedFileFactoryInterface
-        {
-        }
+        interface UploadedFileFactoryInterface {}
     }
-
     if (!interface_exists(UriFactoryInterface::class)) {
-        interface UriFactoryInterface
-        {
-        }
+        interface UriFactoryInterface {}
     }
-
     if (!interface_exists(MessageInterface::class)) {
-        interface MessageInterface
-        {
-        }
+        interface MessageInterface {}
     }
-
     if (!interface_exists(RequestInterface::class)) {
-        interface RequestInterface extends MessageInterface
-        {
-        }
+        interface RequestInterface extends MessageInterface {}
     }
-
     if (!interface_exists(ResponseInterface::class)) {
-        interface ResponseInterface extends MessageInterface
-        {
-        }
+        interface ResponseInterface extends MessageInterface {}
     }
-
     if (!interface_exists(ServerRequestInterface::class)) {
-        interface ServerRequestInterface extends RequestInterface
-        {
-        }
+        interface ServerRequestInterface extends RequestInterface {}
     }
-
     if (!interface_exists(StreamInterface::class)) {
-        interface StreamInterface
-        {
-        }
+        interface StreamInterface {}
     }
-
     if (!interface_exists(UploadedFileInterface::class)) {
-        interface UploadedFileInterface
-        {
-        }
+        interface UploadedFileInterface {}
     }
-
     if (!interface_exists(UriInterface::class)) {
-        interface UriInterface
-        {
-        }
+        interface UriInterface {}
     }
 }
-
 namespace Psr\Http\Server {
-
     if (!interface_exists(RequestHandlerInterface::class)) {
-        interface RequestHandlerInterface
-        {
-        }
+        interface RequestHandlerInterface {}
     }
     if (!interface_exists(MiddlewareInterface::class)) {
-        interface MiddlewareInterface
-        {
-        }
+        interface MiddlewareInterface {}
     }
-
 }
 
 namespace Psr\SimpleCache {
-
     if (!interface_exists(CacheException::class)) {
-        interface CacheException
-        {
-        }
+        interface CacheException {}
     }
     if (!interface_exists(CacheInterface::class)) {
-        interface CacheInterface
-        {
-        }
+        interface CacheInterface {}
     }
     if (!interface_exists(InvalidArgumentException::class)) {
-        interface InvalidArgumentException extends CacheException
-        {
-        }
+        interface InvalidArgumentException extends CacheException {}
     }
-
 }
 
 /**
- * Nyholm
+ * Nyholm  v1.3.2
+ * @todo Может быть конфликт в теории, хотя либа стабильная!
  */
-
-
 namespace Nyholm\Psr7 {
 
     use Psr\Http\Message\StreamInterface;
@@ -319,7 +246,6 @@ private function validateAndTrimHeader($header, $values): array
             }
         }
     }
-
     if (!trait_exists(RequestTrait::class)) {
         trait RequestTrait
         {
@@ -425,10 +351,6 @@ public function __construct(string $method, $uri, array $headers = [], $body = n
             }
         }
     }
-
-
-
-
     if (!class_exists(Response::class)) {
         class Response implements ResponseInterface
         {
@@ -482,7 +404,6 @@ public function withStatus($code, $reasonPhrase = ''): self
             }
         }
     }
-
     if (!class_exists(ServerRequest::class)) {
         class ServerRequest implements ServerRequestInterface
         {
@@ -601,7 +522,6 @@ public function withoutAttribute($attribute): self
             }
         }
     }
-
     if (!class_exists(Stream::class)) {
         class Stream implements StreamInterface
         {
@@ -613,9 +533,7 @@ class Stream implements StreamInterface
             private $size;
             private const READ_WRITE_HASH = ['read' => ['r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true, 'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, 'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true, 'x+t' => true, 'c+t' => true, 'a+' => true], 'write' => ['w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true, 'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true, 'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true]];
 
-            private function __construct()
-            {
-            }
+            private function __construct() {}
 
             public static function create($body = ''): StreamInterface
             {
@@ -805,7 +723,6 @@ public function getMetadata($key = null)
             }
         }
     }
-
     if (!class_exists(UploadedFile::class)) {
         class UploadedFile implements UploadedFileInterface
         {
@@ -923,7 +840,6 @@ public function getClientMediaType(): ?string
             }
         }
     }
-
     if (!class_exists(Uri::class)) {
         class Uri implements UriInterface
         {
@@ -1162,18 +1078,4 @@ private static function rawurlencodeMatchZero(array $match): string
             }
         }
     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 }