Merge branch 'release/0.3.2'

Author: Pavlusha311245

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## v0.3.2 - [2023/07/19]
+
+- Fixed issues with nullable objects and values
+- Added `setListener($listener)` method to Application
+
+## v0.3.1 - [2023/07/18]
+
+- Removed method.
+
 ## v0.3.0 - [2023/07/17]
 
 - Removed Application class

README.md

@@ -5,6 +5,13 @@
 
 _THIS PROJECT IN DEVELOPMENT. DON'T USE IT IN PRODUCTION_
 
+## Supported Versions
+
+| Version | Supported          |
+|---------|--------------------|
+| 0.3.x   | :white_check_mark: |
+| < 0.3.1 | :x:                |
+
 ## Quick start
 
 ### Pre-requirements
@@ -53,3 +60,9 @@ More information about changes you can see [here](CHANGELOG.md)
 
 More info about contribution you can
 read [here](https://docs.github.com/en/get-started/quickstart/contributing-to-projects)
+
+## Security Policy
+
+If you find bugs and vulnerabilities, please contact [[email protected]](mailto:[email protected]).
+
+More info [here](SECURITY.md)

SECURITY.md

@@ -0,0 +1,12 @@
+## Security Policy
+
+## Supported Versions
+
+| Version | Supported |
+| ------- | ------------------ |
+| 0.3.x | :white_check_mark: |
+| < 0.3.1 | :x: |
+
+## Vulnerability Report
+
+Please report all package vulnerabilities as well as dependencies that may also compromise the safe use of this project to [email protected]. Each vulnerability will be treated as a priority for fixes.

composer.json

@@ -22,7 +22,8 @@
   "authors": [
     {
       "name": "Pavel Zavadski",
-      "email": "[email protected]"
+      "email": "[email protected]",
+      "homepage": "https://pavlusha.me/"
     }
   ],
   "minimum-stability": "stable",

composer.lock

@@ -5,43 +5,46 @@
 use Pavlusha311245\UnitPhpSdk\Config\Application\ProcessManagement\ApplicationProcess;
 use Pavlusha311245\UnitPhpSdk\Config\Application\ProcessManagement\ProcessIsolation;
 use Pavlusha311245\UnitPhpSdk\Config\Application\ProcessManagement\RequestLimit;
+use Pavlusha311245\UnitPhpSdk\Config\Listener;
 use Pavlusha311245\UnitPhpSdk\Enums\ApplicationTypeEnum;
 use Pavlusha311245\UnitPhpSdk\Exceptions\UnitException;
 use Pavlusha311245\UnitPhpSdk\Interfaces\ApplicationInterface;
 
 abstract class ApplicationAbstract implements ApplicationInterface
 {
+    private ?Listener $_listener = null;
+
     private string $_type;
 
     /**
      * Environment variables to be passed to the app
      *
      * @var array
      */
-    private array $_environment;
+    private array $_environment = [];
 
     /**
      * Group name that runs the app process
      *
      * @var string
      */
-    protected string $_group;
+    protected string $_group = '';
 
     /**
      * Username that runs the app process
      *
      * @var string
      */
-    protected string $_user;
+    protected string $_user = '';
 
     /**
      * The app working directory.
      *
      * @var string
      */
-    private string $_working_directory;
+    private string $_working_directory = '';
 
-    private string $_name;
+    private string $_name = '';
 
     /**
      * The file path to which Unit redirects the application's error stream output in --no-daemon mode.
@@ -60,13 +63,23 @@ abstract class ApplicationAbstract implements ApplicationInterface
     /**
      * Static number of app processes or object options
      *
-     * @var ApplicationProcess|string
+     * @var string|ApplicationProcess|null
      */
-    private ApplicationProcess|string $_processes;
+    private string|null|ApplicationProcess $_processes = null;
 
-    private RequestLimit $_limits;
+    /**
+     * Control requests limits
+     *
+     * @var RequestLimit|null
+     */
+    private ?RequestLimit $_limits = null;
 
-    private ProcessIsolation $_isolation;
+    /**
+     * You can use namespace and file system isolation for your apps if Unit’s underlying OS supports them
+     *
+     * @var ProcessIsolation|null
+     */
+    private ?ProcessIsolation $_isolation = null;
 
     public function __construct(array $data = null)
     {
@@ -121,7 +134,7 @@ public function setEnvironment(array $environment): void
         $this->_environment = $environment;
     }
 
-    public function getIsolation(): ProcessIsolation
+    public function getIsolation(): ?ProcessIsolation
     {
         return $this->_isolation;
     }
@@ -131,7 +144,7 @@ public function setIsolation(ProcessIsolation $isolation): void
         $this->_isolation = $isolation;
     }
 
-    public function getProcesses(): ApplicationProcess|int
+    public function getProcesses(): ApplicationProcess|int|null
     {
         return $this->_processes;
     }
@@ -141,7 +154,7 @@ public function setProcesses(ApplicationProcess|int $processes): void
         $this->_processes = $processes;
     }
 
-    public function getLimits(): RequestLimit
+    public function getLimits(): ?RequestLimit
     {
         return $this->_limits;
     }
@@ -251,4 +264,20 @@ public function parseFromArray(array $data): void
             $this->setLimits(new RequestLimit($data['limits']));
         }
     }
+
+    /**
+     * @param Listener $listener
+     */
+    public function setListener(Listener $listener): void
+    {
+        $this->_listener = $listener;
+    }
+
+    /**
+     * @return Listener
+     */
+    public function getListener(): ?Listener
+    {
+        return $this->_listener;
+    }
 }

src/Abstract/ApplicationAbstract.php

@@ -69,7 +69,7 @@ public function __construct(array $data)
             $typePath = $listener->getPass()[0];
             $typePathName = $listener->getPass()[1];
 
-//            ($this->{"_{$typePath}"}[$typePathName])->setListener($listener);
+            ($this->{"_{$typePath}"}[$typePathName])->setListener($listener);
 
             $this->_listeners[] = $listener;
         }
@@ -141,9 +141,9 @@ public function getRoutes(): array
      * @param $routeName
      * @return mixed
      */
-    public function getRoute($routeName)
+    public function getRoute(string $routeName): Route|null
     {
-        return $this->_routes[$routeName];
+        return $this->_routes[$routeName] ?? null;
     }
 
     /**

src/Config.php

@@ -7,11 +7,11 @@
 
 class PhpApplication extends ApplicationAbstract
 {
-    private string $_root;
+    private string $_root = '';
 
-    private string $_index;
+    private string $_index = '';
 
-    private string $_script;
+    private string $_script = '';
 
     private $_options;
 

src/Config/Application/PhpApplication.php

@@ -11,66 +11,64 @@ class RouteAction
      *
      * @var string
      */
-    private string $_pass;
+    private string $_pass = '';
 
     /**
      * Socket address of an HTTP server to where the request is proxied.
      *
      * @var string
      */
-    private string $_proxy;
+    private string $_proxy = '';
 
     /**
      * HTTP status code with a context-dependent redirect location.
      * Integer (000–999); defines the HTTP response status code to be returned.
      *
-     * @var int
+     * @var int|null
      */
-    private int $_return;
+    private ?int $_return = null;
 
     /**
      * String URI; used if the return value implies redirection.
      *
      * @var string
      */
-    private string $_location;
+    private string $_location = '';
 
     /**
      * Lists file paths that are tried until a file is found.
      *
      * @var array|string
      */
-    private array|string $_share;
+    private array|string $_share = '';
 
-    private string $_index;
+    private string $_index = '';
 
-    private array $_fallback;
+    private array $_fallback = [];
 
-    private array $_types;
+    private array $_types = [];
 
-    private string $_chroot;
+    private string $_chroot = '';
 
     protected bool $_follow_symlinks;
 
     protected bool $_traverse_mounts;
 
-    private string $_rewrite;
+    private string $_rewrite = '';
 
     public function __construct($data = null)
     {
         if (!empty($data)) {
             $this->parseFromArray($data);
         }
-
-//        $this->_share = $data['share'] ?? null;
     }
 
     /**
      * Receive return key
      *
-     * @return mixed
+     * @return int|null
      */
-    public function getReturn()
+    public function getReturn(): ?int
     {
         return $this->_return;
     }

src/Config/Routes/RouteAction.php

@@ -25,15 +25,15 @@ public function getUser(): string;
 
     public function setUser(string $name): void;
 
-    public function getIsolation(): ProcessIsolation;
+    public function getIsolation(): ?ProcessIsolation;
 
     public function setIsolation(ProcessIsolation $isolation): void;
 
-    public function getLimits(): RequestLimit;
+    public function getLimits(): ?RequestLimit;
 
     public function setLimits(RequestLimit $requestLimit): void;
 
-    public function getProcesses(): ApplicationProcess|int;
+    public function getProcesses(): ApplicationProcess|int|null;
 
     public function setProcesses(ApplicationProcess|int $processes): void;
 

src/Interfaces/ApplicationInterface.php

@@ -4,6 +4,7 @@
 
 use Pavlusha311245\UnitPhpSdk\Abstract\ApplicationAbstract;
 use Pavlusha311245\UnitPhpSdk\Config\Listener;
+use Pavlusha311245\UnitPhpSdk\Config\Route;
 
 interface ConfigInterface
 {
@@ -13,7 +14,7 @@ public function getListenerByPort(int $port): Listener|null;
 
     public function getRoutes(): array;
 
-    public function getRoute($routeName);
+    public function getRoute(string $routeName): Route|null;
 
     public function getApplications(): array;