Coding style imporovements

nijel · nijel · commit e47ffb60ebe3 · 2017-02-14T14:13:27.000+01:00
Signed-off-by: Michal Čihař &lt;michal@cihar.com&gt;
diff --git a/.php_cs b/.php_cs
@@ -12,9 +12,13 @@ return PhpCsFixer\Config::create()
         '@PSR2' => true,
         '@Symfony' => true,
         'array_syntax' => array('syntax' => 'long'),
-        'phpdoc_order' => true,
+        'concat_space' => array('spacing' => true),
+        'ordered_imports' => true,
         'no_trailing_whitespace' => true,
-        'concat_space' => array('spacing' => 'one'),
+        'no_useless_return' => true,
+        'no_useless_else' => true,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_order' => true,
     ))
     ->setFinder($finder)
 ;
diff --git a/src/ShapeFile.php b/src/ShapeFile.php
@@ -56,7 +56,9 @@ public static function supports_dbase()
     }
 
     /**
-     * @param int $shapeType
+     * @param int        $shapeType
+     * @param mixed      $boundingBox
+     * @param null|mixed $FileName
      */
     public function __construct($shapeType, $boundingBox = array('xmin' => 0.0, 'ymin' => 0.0, 'xmax' => 0.0, 'ymax' => 0.0), $FileName = null)
     {
@@ -98,9 +100,9 @@ public function loadFromFile($FileName)
             $this->_closeDBFFile();
 
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
diff --git a/src/Util.php b/src/Util.php
@@ -95,9 +95,9 @@ public static function packDouble($value)
 
         if (self::$little_endian) {
             return $bin;
-        } else {
-            return self::swap($bin);
         }
+
+        return self::swap($bin);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ public static function supports_dbase()`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * @param int $shapeType`
	`59`	`+ * @param int $shapeType`
	`60`	`+ * @param mixed $boundingBox`
	`61`	`+ * @param null\|mixed $FileName`
`60`	`62`	`*/`
`61`	`63`	`public function __construct($shapeType, $boundingBox = array('xmin' => 0.0, 'ymin' => 0.0, 'xmax' => 0.0, 'ymax' => 0.0), $FileName = null)`
`62`	`64`	`{`
`@@ -98,9 +100,9 @@ public function loadFromFile($FileName)`
`98`	`100`	`$this->_closeDBFFile();`
`99`	`101`
`100`	`102`	`return true;`
`101`		`- } else {`
`102`		`- return false;`
`103`	`103`	`}`
	`104`	`+`
	`105`	`+ return false;`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ public static function packDouble($value)`
`95`	`95`
`96`	`96`	`if (self::$little_endian) {`
`97`	`97`	`return $bin;`
`98`		`- } else {`
`99`		`- return self::swap($bin);`
`100`	`98`	`}`
	`99`	`+`
	`100`	`+ return self::swap($bin);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`