platine-php / framework

src/Service/Provider/OAuth2ServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
         $this->app->bind(UserAuthenticationInterface::class, UserAuthentication::class);

 

         // Configuration

-        $this->app->bind(Configuration::class, function (ContainerInterface $app) {

+        $this->app->bind(Configuration::class, function(ContainerInterface $app) {

             return new Configuration($app->get(Config::class)->get('oauth2', []));

         });

 

@@ -164,7 +164,7 @@ 
      */

     public function addRoutes(Router $router): void

     {

-        $router->group('/oauth2', function (Router $router) {

+        $router->group('/oauth2', function(Router $router) {

             $router->post('/token', AccessTokenRequestHandler::class, 'oauth2_access_token');

             $router->add('/authorize', AuthorizationRequestHandler::class, ['GET', 'POST'], 'oauth2_authorization_code');

             $router->post('/revocation', TokenRevocationRequestHandler::class, 'oauth2_revoke_access_token');

Braces +6 added lines, -7 removed lines

@@ -93,8 +93,7 @@ 
  * @class OAuth2ServiceProvider

  * @package Platine\App\Provider

  */

-class OAuth2ServiceProvider extends ServiceProvider

-{

+class OAuth2ServiceProvider extends ServiceProvider {
     /**

      * {@inheritdoc}

      */

@@ -105,7 +104,7 @@ 
         $this->app->bind(UserAuthenticationInterface::class, UserAuthentication::class);

 

         // Configuration

-        $this->app->bind(Configuration::class, function (ContainerInterface $app) {

+        $this->app->bind(Configuration::class, function (ContainerInterface $app) {
             return new Configuration($app->get(Config::class)->get('oauth2', []));

         });

 

@@ -134,10 +133,10 @@ 
         $cfg = $this->app->get(Configuration::class);

         $grants = $cfg->getGrants();

         $serverGrants = [];

-        foreach ($grants as $grant) {

-            if ($this->app->has($grant)) {

+        foreach ($grants as $grant) {
+            if ($this->app->has($grant)) {
                 $serverGrants[] = $this->app->get($grant);

-            } else {

+            } else {
                 $serverGrants[] = new $grant();

             }

         }

@@ -164,7 +163,7 @@ 
      */

     public function addRoutes(Router $router): void

     {

-        $router->group('/oauth2', function (Router $router) {

+        $router->group('/oauth2', function (Router $router) {
             $router->post('/token', AccessTokenRequestHandler::class, 'oauth2_access_token');

             $router->add('/authorize', AuthorizationRequestHandler::class, ['GET', 'POST'], 'oauth2_authorization_code');

             $router->post('/revocation', TokenRevocationRequestHandler::class, 'oauth2_revoke_access_token');

src/Service/Provider/DatabaseServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
      */

     public function register(): void

     {

-        $this->app->bind(Configuration::class, function (ContainerInterface $app) {

+        $this->app->bind(Configuration::class, function(ContainerInterface $app) {

             /** @template T @var Config<T> $config */

             $config = $app->get(Config::class);

             $driver = $config->get('database.default', 'default');

@@ -77,11 +77,11 @@ 
             return new Configuration($config->get('database.connections.' . $driver, []));

         });

 

-        $this->app->share(Pool::class, function (ContainerInterface $app) {

+        $this->app->share(Pool::class, function(ContainerInterface $app) {

             return new Pool($app->get(Config::class)->get('database', []));

         });

 

-        $this->app->share(Connection::class, function (ContainerInterface $app) {

+        $this->app->share(Connection::class, function(ContainerInterface $app) {

             return new Connection(

                 $app->get(Configuration::class),

                 $app->get(LoggerInterface::class)

Braces +4 added lines, -5 removed lines

@@ -62,14 +62,13 @@ 
  * @class DatabaseServiceProvider

  * @package Platine\Framework\Service\Provider

  */

-class DatabaseServiceProvider extends ServiceProvider

-{

+class DatabaseServiceProvider extends ServiceProvider {
     /**

      * {@inheritdoc}

      */

     public function register(): void

     {

-        $this->app->bind(Configuration::class, function (ContainerInterface $app) {

+        $this->app->bind(Configuration::class, function (ContainerInterface $app) {
             /** @template T @var Config<T> $config */

             $config = $app->get(Config::class);

             $driver = $config->get('database.default', 'default');

@@ -77,11 +76,11 @@ 
             return new Configuration($config->get('database.connections.' . $driver, []));

         });

 

-        $this->app->share(Pool::class, function (ContainerInterface $app) {

+        $this->app->share(Pool::class, function (ContainerInterface $app) {
             return new Pool($app->get(Config::class)->get('database', []));

         });

 

-        $this->app->share(Connection::class, function (ContainerInterface $app) {

+        $this->app->share(Connection::class, function (ContainerInterface $app) {
             return new Connection(

                 $app->get(Configuration::class),

                 $app->get(LoggerInterface::class)

src/Service/Provider/EncryptionServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     public function register(): void

     {

         $this->app->bind(AdapterInterface::class, OpenSSL::class);

-        $this->app->bind(Encryption::class, function (ContainerInterface $app) {

+        $this->app->bind(Encryption::class, function(ContainerInterface $app) {

             $e = new Encryption($app->get(AdapterInterface::class));

             $e->setSecret($app->get(Config::class)->get('security.encryption.key', ''));

 

Braces +2 added lines, -3 removed lines

@@ -58,15 +58,14 @@
  * @class EncryptionServiceProvider

  * @package Platine\Framework\Service\Provider

  */

-class EncryptionServiceProvider extends ServiceProvider

-{

+class EncryptionServiceProvider extends ServiceProvider {
     /**

      * {@inheritdoc}

      */

     public function register(): void

     {

         $this->app->bind(AdapterInterface::class, OpenSSL::class);

-        $this->app->bind(Encryption::class, function (ContainerInterface $app) {

+        $this->app->bind(Encryption::class, function (ContainerInterface $app) {
             $e = new Encryption($app->get(AdapterInterface::class));

             $e->setSecret($app->get(Config::class)->get('security.encryption.key', ''));

 

src/Service/Provider/DatabaseConfigServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             DatabaseConfigLoader::class

         );

 

-        $this->app->share(AppDatabaseConfig::class, function (ContainerInterface $app) {

+        $this->app->share(AppDatabaseConfig::class, function(ContainerInterface $app) {

             $env = $app->get(Config::class)->get('app.env', '');

             return new AppDatabaseConfig($app->get(DatabaseConfigLoaderInterface::class), $env);

         });

Braces +2 added lines, -3 removed lines

@@ -60,8 +60,7 @@ 
  * @class DatabaseConfigServiceProvider

  * @package Platine\Framework\Service\Provider

  */

-class DatabaseConfigServiceProvider extends ServiceProvider

-{

+class DatabaseConfigServiceProvider extends ServiceProvider {
     /**

      * {@inheritdoc}

      */

@@ -73,7 +72,7 @@ 
             DatabaseConfigLoader::class

         );

 

-        $this->app->share(AppDatabaseConfig::class, function (ContainerInterface $app) {

+        $this->app->share(AppDatabaseConfig::class, function (ContainerInterface $app) {
             $env = $app->get(Config::class)->get('app.env', '');

             return new AppDatabaseConfig($app->get(DatabaseConfigLoaderInterface::class), $env);

         });

src/Service/Provider/LangServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
      */

     public function register(): void

     {

-        $this->app->bind(Configuration::class, function (ContainerInterface $app) {

+        $this->app->bind(Configuration::class, function(ContainerInterface $app) {

             return new Configuration($app->get(Config::class)->get('lang', []));

         });

         $this->app->share(StorageInterface::class, MemoryStorage::class);

Braces +2 added lines, -3 removed lines

@@ -61,14 +61,13 @@
  * @class LangServiceProvider

  * @package Platine\Framework\Service\Provider

  */

-class LangServiceProvider extends ServiceProvider

-{

+class LangServiceProvider extends ServiceProvider {
     /**

      * {@inheritdoc}

      */

     public function register(): void

     {

-        $this->app->bind(Configuration::class, function (ContainerInterface $app) {

+        $this->app->bind(Configuration::class, function (ContainerInterface $app) {
             return new Configuration($app->get(Config::class)->get('lang', []));

         });

         $this->app->share(StorageInterface::class, MemoryStorage::class);

src/Service/ServiceProvider.php

Braces +2 added lines, -4 removed lines

@@ -57,8 +57,7 @@ 
  * @class ServiceProvider

  * @package Platine\Framework\Service

  */

-class ServiceProvider

-{

+class ServiceProvider {
     /**

      * The Application instance

      * @var Application

@@ -81,8 +80,7 @@ 
      * Create new instance

      * @param Application $app

      */

-    public function __construct(Application $app)

-    {

+    public function __construct(Application $app) {
         $this->app = $app;

     }

 

src/Config/AppDatabaseConfig.php

Indentation +4 added lines, -4 removed lines

@@ -128,10 +128,10 @@
         $name = $results['key'];

 

         $config = $this->loader->loadConfig([

-             'name' => $name,

-             'module' => $module,

-             'env' => $this->env

-         ]);

+                'name' => $name,

+                'module' => $module,

+                'env' => $this->env

+            ]);

 

         if ($config === null) {

             $this->loader->insertConfig([

Braces +13 added lines, -21 removed lines

@@ -57,8 +57,7 @@ 
  * @template TDbConfigurationEntity as \Platine\Framework\Config\Model\Configuration

  * @implements ArrayAccess<string, mixed>

  */

-class AppDatabaseConfig implements ArrayAccess

-{

+class AppDatabaseConfig implements ArrayAccess {
     /**

      * The configuration loader to use

      * @var DatabaseConfigLoaderInterface<TDbConfigurationEntity>

@@ -82,8 +81,7 @@ 
      * @param DatabaseConfigLoaderInterface<TDbConfigurationEntity> $loader the loader to use

      * @param string          $env    the name of the environment

      */

-    public function __construct(DatabaseConfigLoaderInterface $loader, string $env = '')

-    {

+    public function __construct(DatabaseConfigLoaderInterface $loader, string $env = '') {
         $this->loader = $loader;

         $this->env = $env;

     }

@@ -105,8 +103,7 @@ 
      * not find the configuration item

      * @return mixed

      */

-    public function get(string $key, $default = null)

-    {

+    public function get(string $key, $default = null) {
         $results = $this->parseKey($key);

         $group = $results['group'];

 

@@ -133,7 +130,7 @@ 
              'env' => $this->env

          ]);

 

-        if ($config === null) {

+        if ($config === null) {
             $this->loader->insertConfig([

                 'env' => $this->env,

                 'module' => $module,

@@ -142,7 +139,7 @@ 
                 'value' => $this->getFormattedConfigValue($value),

                 'type' => gettype($value)

             ]);

-        } else {

+        } else {
             $config->value = $this->getFormattedConfigValue($value);

             $config->type = gettype($value);

 

@@ -215,16 +212,14 @@ 
     /**

      * {@inheritdoc}

      */

-    public function offsetExists($key)

-    {

+    public function offsetExists($key) {
         return $this->has($key);

     }

 

     /**

      * {@inheritdoc}

      */

-    public function offsetGet($key)

-    {

+    public function offsetGet($key) {
         return $this->get($key);

     }

 

@@ -234,16 +229,14 @@ 
      * @param mixed $value

      * @return void

      */

-    public function offsetSet($key, $value)

-    {

+    public function offsetSet($key, $value) {
         $this->set($key, $value);

     }

 

     /**

      * {@inheritdoc}

      */

-    public function offsetUnset($key)

-    {

+    public function offsetUnset($key) {
         $this->set($key, null);

     }

 

@@ -257,7 +250,7 @@ 
         // If we've already loaded this collection, we will just bail out since we do

         // not want to load it again. Once items are loaded a first time they will

         // stay kept in memory within this class and not loaded from disk again.

-        if (isset($this->items[$group])) {

+        if (isset($this->items[$group])) {
             return;

         }

 

@@ -272,7 +265,7 @@ 
      */

     protected function parseKey(string $key): array

     {

-        if (strpos($key, '.') === false) {

+        if (strpos($key, '.') === false) {
             throw new InvalidArgumentException(sprintf(

                 'Invalid configuration key [%s] must have format module.name',

                 $key

@@ -292,9 +285,8 @@ 
      * @param mixed $value

      * @return mixed

      */

-    protected function getFormattedConfigValue($value)

-    {

-        if (is_array($value) || is_object($value)) {

+    protected function getFormattedConfigValue($value) {
+        if (is_array($value) || is_object($value)) {
             return serialize($value);

         }

 

src/Config/DatabaseConfigLoader.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                                 ->query()

                                 ->where('module')->is($group)

                                 ->where('status')->is('Y')

-                                ->where(function (WhereStatement $where) use ($env) {

+                                ->where(function(WhereStatement $where) use ($env) {

                                     $where->where('env')->is($env)

                                     ->orWhere('env')->isNull();

                                 });

Braces +6 added lines, -9 removed lines

@@ -56,8 +56,7 @@ 
  * @package Platine\Framework\Config

  * @implements DatabaseConfigLoaderInterface<Configuration>

  */

-class DatabaseConfigLoader implements DatabaseConfigLoaderInterface

-{

+class DatabaseConfigLoader implements DatabaseConfigLoaderInterface {
     /**

      * The Repository instance

      * @var ConfigurationRepositoryInterface<Configuration>

@@ -69,8 +68,7 @@ 
      * Create new instance

      * @param ConfigurationRepositoryInterface<Configuration> $repository

      */

-    public function __construct(ConfigurationRepositoryInterface $repository)

-    {

+    public function __construct(ConfigurationRepositoryInterface $repository) {
         $this->repository = $repository;

     }

 

@@ -93,8 +91,7 @@ 
     /**

      * {@inheritdoc}

      */

-    public function insertConfig(array $data)

-    {

+    public function insertConfig(array $data) {
         $entity = $this->repository->create($data);

         return $this->repository->insert($entity);

     }

@@ -128,7 +125,7 @@ 
                                 ->query()

                                 ->where('module')->is($group)

                                 ->where('status')->is('Y')

-                                ->where(function (WhereStatement $where) use ($env) {

+                                ->where(function (WhereStatement $where) use ($env) {
                                     $where->where('env')->is($env)

                                     ->orWhere('env')->isNull();

                                 });

@@ -138,10 +135,10 @@ 
         $results = $query->all();

 

         $items = [];

-        foreach ($results as $result) {

+        foreach ($results as $result) {
             /** @var string $name */

             $name = $result->name;

-            if (!empty($name)) {

+            if (!empty($name)) {
                 $items[$name] = ConfigUtil::convertToDataType(

                     $result->value,

                     (string) $result->type

src/Config/Model/Configuration.php

Spacing +4 added lines, -4 removed lines

@@ -71,19 +71,19 @@
             'updated_at' => '?date',

         ]);

 

-        $mapper->filter('status', function (Query $q, $value) {

+        $mapper->filter('status', function(Query $q, $value) {

             $q->where('status')->is($value);

         });

 

-        $mapper->filter('env', function (Query $q, $value) {

+        $mapper->filter('env', function(Query $q, $value) {

             $q->where('env')->is($value);

         });

 

-        $mapper->filter('module', function (Query $q, $value) {

+        $mapper->filter('module', function(Query $q, $value) {

             $q->where('module')->is($value);

         });

 

-        $mapper->filter('type', function (Query $q, $value) {

+        $mapper->filter('type', function(Query $q, $value) {

             $q->where('type')->is($value);

         });

     }

Braces +5 added lines, -6 removed lines

@@ -56,8 +56,7 @@ 
  * @package Platine\Framework\Config\Model

  * @extends Entity<Configuration>

  */

-class Configuration extends Entity

-{

+class Configuration extends Entity {
     /**

      *

      * @param EntityMapperInterface<Configuration> $mapper

@@ -71,19 +70,19 @@ 
             'updated_at' => '?date',

         ]);

 

-        $mapper->filter('status', function (Query $q, $value) {

+        $mapper->filter('status', function (Query $q, $value) {
             $q->where('status')->is($value);

         });

 

-        $mapper->filter('env', function (Query $q, $value) {

+        $mapper->filter('env', function (Query $q, $value) {
             $q->where('env')->is($value);

         });

 

-        $mapper->filter('module', function (Query $q, $value) {

+        $mapper->filter('module', function (Query $q, $value) {
             $q->where('module')->is($value);

         });

 

-        $mapper->filter('type', function (Query $q, $value) {

+        $mapper->filter('type', function (Query $q, $value) {
             $q->where('type')->is($value);

         });

     }