updated codestyle

Author: Nikita Chernyi

.php_cs.dist

@@ -6,18 +6,19 @@ $finder = \PhpCsFixer\Finder::create()
 return \PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules(array(
+        '@PHP71Migration' => true,
+        '@PHP71Migration:risky' => true,
         '@PSR1' => true,
         '@PSR2' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP71Migration' => true,
-        '@PHP71Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'list_syntax' => ['syntax' => 'short'],
-        'no_short_echo_tag' => true,
+        'native_function_invocation' => true,
         'no_extra_consecutive_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
         'no_null_property_initialization' => true,
         'no_short_echo_tag' => true,
+        'no_short_echo_tag' => true,
         'no_superfluous_elseif' => true,
         'no_unneeded_curly_braces' => true,
         'no_unneeded_final_method' => true,

src/Entity.php

@@ -21,7 +21,7 @@ abstract class Entity extends \Wtf\Root
      */
     protected function __getEntityName(): string
     {
-        return ($pos = strrpos(get_class($this), '\\')) ? substr(get_class($this), $pos + 1) : get_class($this);
+        return ($pos = \strrpos(\get_class($this), '\\')) ? \substr(\get_class($this), $pos + 1) : \get_class($this);
     }
 
     /**
@@ -32,9 +32,9 @@ protected function __getEntityName(): string
      */
     public function __call(?string $method = null, array $params = [])
     {
-        $parts = preg_split('/([A-Z][^A-Z]*)/', $method, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-        $type = array_shift($parts);
-        $relation = strtolower(implode('_', $parts));
+        $parts = \preg_split('/([A-Z][^A-Z]*)/', $method, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $type = \array_shift($parts);
+        $relation = \strtolower(\implode('_', $parts));
 
         if ('get' === $type && isset($this->getRelations()[$relation])) {
             return $this->loadRelation($relation);
@@ -80,7 +80,7 @@ public function getData(): array
      */
     public function setData(array $data)
     {
-        $this->data = array_merge($this->data, $data);
+        $this->data = \array_merge($this->data, $data);
 
         return $this;
     }
@@ -149,9 +149,9 @@ public function validate(string $method = 'save'): array
     public function load($value, $field = 'id', array $fields = null): self
     {
         $data = $this->medoo->get($this->getTable(), $fields ?? '*', [$field => $value]);
-        $this->data = is_array($data) ? $data : []; //handle empty result gracefuly
+        $this->data = \is_array($data) ? $data : []; //handle empty result gracefuly
         $this->sentry->breadcrumbs->record([
-            'message' => 'Entity '.$this->__getEntityName().'::load('.$value.', '.$field.', ['.implode(', ', $fields ?? []).')',
+            'message' => 'Entity '.$this->__getEntityName().'::load('.$value.', '.$field.', ['.\implode(', ', $fields ?? []).')',
             'data' => ['query' => $this->medoo->last()],
             'category' => 'Database',
             'level' => 'info',
@@ -172,7 +172,7 @@ public function loadAll(array $where = [], bool $assoc = false): Collection
     {
         $allData = $this->medoo->select($this->getTable(), '*', $where);
         $this->sentry->breadcrumbs->record([
-            'message' => 'Entity '.$this->__getEntityName().'::loadAll('.print_r($where, true).')',
+            'message' => 'Entity '.$this->__getEntityName().'::loadAll('.\print_r($where, true).')',
             'data' => ['query' => $this->medoo->last()],
             'category' => 'Database',
             'level' => 'info',

src/Provider.php

@@ -44,10 +44,10 @@ protected function setMedoo(Container $container): callable
     protected function setEntityLoader(Container $container): callable
     {
         return $container->protect(function (string $name) use ($container) {
-            $parts = explode('_', $name);
+            $parts = \explode('_', $name);
             $class = $container['config']('medoo.namespace');
             foreach ($parts as $part) {
-                $class .= ucfirst($part);
+                $class .= \ucfirst($part);
             }
             if (!$container->has('entity_'.$class)) {
                 $container['entity_'.$class] = $container->factory(function ($container) use ($class) {

tests/EntityTest.php

@@ -17,9 +17,9 @@ protected function setUp(): void
         $app = new \Wtf\App(['config_dir' => $dir]);
         $this->container = $app->getContainer();
         //Init db
-        ob_start();
+        \ob_start();
         include $dir.'/../dump.sql';
-        $query = ob_get_clean();
+        $query = \ob_get_clean();
         $this->container->medoo->pdo->exec($query);
     }
 
@@ -115,7 +115,7 @@ public function testLoadRelation(): void
             'title' => 'Test',
             'description' => 'test',
         ]);
-        foreach (range(1, 5) as $i) {
+        foreach (\range(1, 5) as $i) {
             $article->setId(null);
             $article->save();
         }

tests/bootstrap.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 // Enable Composer autoloader
 /** @var \Composer\Autoload\ClassLoader $autoloader */
-$autoloader = require dirname(__DIR__).'/vendor/autoload.php';
+$autoloader = require \dirname(__DIR__).'/vendor/autoload.php';
 // Register test classes
 $autoloader->addPsr4('Wtf\\ORM\\Tests\\', __DIR__);
 $autoloader->addPsr4('Wtf\\ORM\\Tests\\Dummy\\', __DIR__.'/data/dummy');