cs: Fix code style (safe rules only).

src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php

@@ -1,20 +1,12 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -22,16 +14,21 @@ use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class GetJsonFieldByKey extends FunctionNode
 {
     private $expr1;
+
     private $expr2;
 
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            '(%s->%s)',
+            $this->expr1->dispatch($sqlWalker),
+            $this->expr2->dispatch($sqlWalker)
+        );
+    }
+
     public function parse(Parser $parser)
     {
         $parser->match(Lexer::T_IDENTIFIER);
@@ -41,13 +38,4 @@ class GetJsonFieldByKey extends FunctionNode
         $this->expr2 = $parser->StringPrimary();
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
-
-    public function getSql(SqlWalker $sqlWalker)
-    {
-        return sprintf(
-            '(%s->%s)',
-            $this->expr1->dispatch($sqlWalker),
-            $this->expr2->dispatch($sqlWalker)
-        );
-    }
 }

src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php

@@ -1,20 +1,12 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -24,16 +16,14 @@ use Doctrine\ORM\Query\SqlWalker;
 
 /**
  * Return an aggregation of values in a json representation, as a string.
- * 
+ *
  * Internally, this function use the postgresql `jsonb_agg` function. Using
  * json allow to aggregate data from different types without have to cast them.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class JsonAggregate extends FunctionNode
 {
     private $expr;
-    
+
     public function getSql(SqlWalker $sqlWalker)
     {
         return sprintf('jsonb_agg(%s)', $this->expr->dispatch($sqlWalker));

src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php

@@ -1,8 +1,12 @@
 <?php
-/*
- *
+
+/**
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -11,7 +15,7 @@ use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 
 /**
- * Return the length of an array
+ * Return the length of an array.
  */
 class JsonbArrayLength extends FunctionNode
 {

src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php

@@ -1,8 +1,12 @@
 <?php
-/*
- *
+
+/**
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -10,13 +14,10 @@ use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 
-/**
- *
-  @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class JsonbExistsInArray extends FunctionNode
 {
     private $expr1;
+
     private $expr2;
 
     public function getSql(SqlWalker $sqlWalker): string

src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\DQL;
@@ -8,23 +15,24 @@ use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
+use Exception;
 
 /**
- * DQL function for OVERLAPS function in postgresql
+ * DQL function for OVERLAPS function in postgresql.
  *
  * If a value is null in period start, it will be replaced by -infinity.
  * If a value is null in period end, it will be replaced by infinity
  */
 class OverlapsI extends FunctionNode
 {
-    private $firstPeriodStart;
-
     private $firstPeriodEnd;
 
-    private $secondPeriodStart;
+    private $firstPeriodStart;
 
     private $secondPeriodEnd;
 
+    private $secondPeriodStart;
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
         return sprintf(
@@ -36,36 +44,6 @@ class OverlapsI extends FunctionNode
         );
     }
 
-    protected function makeCase($sqlWalker, $part, string $position): string
-    {
-        switch ($position) {
-            case 'start' :
-                $p = '-infinity';
-                break;
-            case 'end':
-                $p = 'infinity';
-                break;
-            default:
-                throw new \Exception('Unexpected position value.');
-        }
-
-        if ($part instanceof PathExpression) {
-            return sprintf(
-                "CASE WHEN %s IS NOT NULL THEN %s ELSE '%s'::date END",
-                $part->dispatch($sqlWalker),
-                $part->dispatch($sqlWalker),
-                $p
-            );
-        }
-
-        return sprintf(
-            "CASE WHEN %s::date IS NOT NULL THEN %s::date ELSE '%s'::date END",
-            $part->dispatch($sqlWalker),
-            $part->dispatch($sqlWalker),
-            $p
-        );
-    }
-
     public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
@@ -92,4 +70,38 @@ class OverlapsI extends FunctionNode
 
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
+
+    protected function makeCase($sqlWalker, $part, string $position): string
+    {
+        switch ($position) {
+            case 'start':
+                $p = '-infinity';
+
+                break;
+
+            case 'end':
+                $p = 'infinity';
+
+                break;
+
+            default:
+                throw new Exception('Unexpected position value.');
+        }
+
+        if ($part instanceof PathExpression) {
+            return sprintf(
+                "CASE WHEN %s IS NOT NULL THEN %s ELSE '%s'::date END",
+                $part->dispatch($sqlWalker),
+                $part->dispatch($sqlWalker),
+                $p
+            );
+        }
+
+        return sprintf(
+            "CASE WHEN %s::date IS NOT NULL THEN %s::date ELSE '%s'::date END",
+            $part->dispatch($sqlWalker),
+            $part->dispatch($sqlWalker),
+            $p
+        );
+    }
 }

src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php

@@ -1,46 +1,33 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2019 Champs-Libres Coopérative <info@champs-libres.coop>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
-/**
- * 
- *
- */
 class Replace extends FunctionNode
 {
-    protected $string;
-    
     protected $from;
-    
+
+    protected $string;
+
     protected $to;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
-        return 'REPLACE('.
-            $this->string->dispatch($sqlWalker).
-            ', '.
-            $this->from->dispatch($sqlWalker).
-            ', '.
-            $this->to->dispatch($sqlWalker).
+        return 'REPLACE(' .
+            $this->string->dispatch($sqlWalker) .
+            ', ' .
+            $this->from->dispatch($sqlWalker) .
+            ', ' .
+            $this->to->dispatch($sqlWalker) .
             ')';
     }
 
@@ -48,17 +35,17 @@ class Replace extends FunctionNode
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->string = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->from = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->to = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }

src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php

@@ -1,28 +1,19 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
 /**
- * Geometry function 'ST_CONTAINS', added by postgis
+ * Geometry function 'ST_CONTAINS', added by postgis.
  */
 class STContains extends FunctionNode
 {
@@ -32,8 +23,8 @@ class STContains extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ST_CONTAINS('.$this->firstPart->dispatch($sqlWalker).
-            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+        return 'ST_CONTAINS(' . $this->firstPart->dispatch($sqlWalker) .
+            ', ' . $this->secondPart->dispatch($sqlWalker) . ')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)

src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php

@@ -1,21 +1,12 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -29,8 +20,8 @@ class Similarity extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker).
-            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+        return 'SIMILARITY(' . $this->firstPart->dispatch($sqlWalker) .
+            ', ' . $this->secondPart->dispatch($sqlWalker) . ')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)

src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\Lexer;
@@ -12,13 +19,13 @@ class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\Function
 
     private $secondPart;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(SqlWalker $sqlWalker)
     {
-        return $this->firstPart->dispatch($sqlWalker).
+        return $this->firstPart->dispatch($sqlWalker) .
             ' <<% ' . $this->secondPart->dispatch($sqlWalker);
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(Parser $parser)
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php

@@ -1,21 +1,10 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace Chill\MainBundle\Doctrine\DQL;
@@ -24,30 +13,27 @@ use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
 /**
- * Unaccent string using postgresql extension unaccent : 
- * http://www.postgresql.org/docs/current/static/unaccent.html
- * 
- * Usage : StringFunction UNACCENT(string)
+ * Unaccent string using postgresql extension unaccent :
+ * http://www.postgresql.org/docs/current/static/unaccent.html.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Usage : StringFunction UNACCENT(string)
  */
 class Unaccent extends FunctionNode
 {
     private $string;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'UNACCENT(' . $this->string->dispatch($sqlWalker) .")";
+        return 'UNACCENT(' . $this->string->dispatch($sqlWalker) . ')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->string = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
-
 }