Revue de code.

soosyze · Mar 14, 2021 · d3494af · d3494af
1 parent 555fa97
commit d3494af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -2,6 +2,7 @@
 
 /* friendsofphp/php-cs-fixer: 1.13.* */
 $finder = PhpCsFixer\Finder::create()
+    ->exclude('build')
     ->in(__DIR__);
 
 return PhpCsFixer\Config::create()

diff --git a/src/Request.php b/src/Request.php
@@ -147,17 +147,17 @@ public function __toString()
      * @param string $name Nom de la méthode appelée.
      * @param array  $arg  Pararètre de la méthode.
      *
+     * @throws \BadMethodCallException
      * @return $this
-     * @throws BadMethodCallException
      */
-    public function __call( $name, $arg )
+    public function __call($name, $arg)
     {
-        if( method_exists($this->where, $name) ) {
-            throw new BadMethodCallException("The $name method not exist");
-        }
-        if( $this->where === null ) {
+        if ($this->where === null) {
             $this->where = new Where();
         }
+        if (!method_exists($this->where, $name)) {
+            throw new \BadMethodCallException("The $name method not exist");
+        }
 
         call_user_func_array([ $this->where, $name ], $arg);
 
@@ -440,7 +440,7 @@ protected function executeJoins($type, $table, Where $where)
      * @param array $data    Données à trier.
      * @param array $orderBy Clés sur lesquelles le trie s'exécute.
      *
-     * @return array les données triées
+     * @return void
      */
     protected function executeOrderBy(array &$data, array $orderBy)
     {

diff --git a/src/WhereHandler.php b/src/WhereHandler.php
@@ -82,7 +82,7 @@ public function where(
 
             return $this;
         }
-        if ($value === null) {
+        if ($operator !== null && $value === null) {
             list($value, $operator) = [ $operator, '=' ];
         }
 
@@ -467,6 +467,8 @@ protected function whereCallback(\Closure $column, $bool = self::EXP_AND, $not =
      * @param string $operator
      * @param string $value
      * @param string $bool
+     *
+     * @return void
      */
     protected function like($column, $operator, $value, $bool = self::EXP_AND)
     {