コード整形

ateliee · Oct 5, 2019 · aba644a · aba644a
1 parent 10dcfd8
commit aba644a
Show file tree

Hide file tree

Showing 24 changed files with 210 additions and 130 deletions.
diff --git a/README.md b/README.md
@@ -157,10 +157,17 @@ customer |o-ri-o{ order
 ```
 
 ## コードチェック
+CodeSnifferを利用
+
 ```
-vendor/bin/phpcs src
+# レポート出力
+composer report
+# 自動修正
+composer convert
 ```
 
+
+
 ## 参考
 * [Plant UML](http://plantuml.com/ja/)
 * [Real World PlantUML](https://real-world-plantuml.com/)
diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
     "scripts": {
         "test": "phpunit",
         "check": "php vendor/bin/phpcs --standard=phpcs.xml",
-        "report": "php vendor/bin/phpcs -sq --no-colors --report-diff=./logs/report-diff.log --report-full=./logs/report-full.log --standard=phpcs.xml"
+        "report": "php vendor/bin/phpcs -sq --no-colors --report-diff=./logs/report-diff.log --report-full=./logs/report-full.log --standard=phpcs.xml",
+        "convert": "php vendor/bin/phpcbf --standard=phpcs.xml"
     },
     "config": {
         "platform": {

diff --git a/src/PlantUMLParser/Exception/FileOpenException.php b/src/PlantUMLParser/Exception/FileOpenException.php
@@ -4,4 +4,7 @@
  */
 namespace Ateliee\PlantUMLParser\Exception;
 
-class FileOpenException extends PUMLException {}
+class FileOpenException extends PUMLException
+{
+
+}
diff --git a/src/PlantUMLParser/Exception/InvalidParamaterException.php b/src/PlantUMLParser/Exception/InvalidParamaterException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Ateliee\PlantUMLParser\Exception;
+
 /**
  * Invalid Paramater Error
  */
-class InvalidParamaterException extends PUMLException {}
+class InvalidParamaterException extends PUMLException
+{
+
+}
diff --git a/src/PlantUMLParser/Exception/PUMLException.php b/src/PlantUMLParser/Exception/PUMLException.php
@@ -1,6 +1,7 @@
 <?php
 namespace Ateliee\PlantUMLParser\Exception;
 
-class PUMLException extends \Exception {
+class PUMLException extends \Exception
+{
 
-}
+}
diff --git a/src/PlantUMLParser/Exception/ParseInvalidException.php b/src/PlantUMLParser/Exception/ParseInvalidException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Ateliee\PlantUMLParser\Exception;
+
 /**
  * Invalid Parse Error
  */
-class ParseInvalidException extends PUMLException {}
+class ParseInvalidException extends PUMLException
+{
+
+}
diff --git a/src/PlantUMLParser/Exception/SyntaxException.php b/src/PlantUMLParser/Exception/SyntaxException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Ateliee\PlantUMLParser\Exception;
+
 /**
  * Syntax Error
  */
-class SyntaxException extends PUMLException {}
+class SyntaxException extends PUMLException
+{
+
+}
diff --git a/src/PlantUMLParser/PUMLElement.php b/src/PlantUMLParser/PUMLElement.php
@@ -1,17 +1,19 @@
 <?php
 namespace Ateliee\PlantUMLParser;
 
-abstract class PUMLElement {
+abstract class PUMLElement
+{
 
     /**
      * get PUML Element name
      *
      * @return string
      */
-    public static function name(){
+    public static function name()
+    {
         $c = explode('\\', get_called_class());
         $c = end($c);
-        if(preg_match('/^PUML(.+)$/', $c, $matchs)){
+        if (preg_match('/^PUML(.+)$/', $c, $matchs)) {
             $c = $matchs[1];
         }
         return $c;
@@ -62,17 +64,17 @@ public function getComment()
      */
     public function getOutputComment($indent = '')
     {
-        if($this->comment){
+        if ($this->comment) {
             $list = explode(PHP_EOL, $this->comment);
             $before = '/\'';
             $after = '\'/';
-            if(count($list) > 1){
+            if (count($list) > 1) {
                 $before = $indent.$before.PHP_EOL;
                 $after = PHP_EOL.$indent.$after;
-                $list = array_map(function($str) use ($indent){
+                $list = array_map(function ($str) use ($indent) {
                     return $indent.'  '.$str;
                 }, $list);
-            }else{
+            } else {
                 $before = $indent.$before.' ';
                 $after = ' '.$after;
             }
@@ -96,13 +98,14 @@ public function getValue()
      * @param int $indent
      * @return mixed
      */
-    public abstract function str($current_indent, $indent);
+    abstract public function str($current_indent, $indent);
 
     /**
      * @param int $indent
      * @return string
      */
-    protected function make_indent($indent = 2){
+    protected function makeIndent($indent = 2)
+    {
         return str_repeat(' ', $indent);
     }
 }
diff --git a/src/PlantUMLParser/PUMLElementBlock.php b/src/PlantUMLParser/PUMLElementBlock.php
@@ -4,7 +4,8 @@
 /**
  * @property string $value
  */
-class PUMLElementBlock extends PUMLElement implements \ArrayAccess {
+class PUMLElementBlock extends PUMLElement implements \ArrayAccess
+{
 
     /**
      * @var PUMLElementList $childs
@@ -25,15 +26,17 @@ public function __construct($value)
      * @param PUMLElement $elm
      * @return $this
      */
-    public function add($elm){
+    public function add($elm)
+    {
         $this->childs->add($elm);
         return $this;
     }
 
     /**
      * @return string
      */
-    public function getValueLabel(){
+    public function getValueLabel()
+    {
         return $this->value;
     }
 
@@ -46,9 +49,9 @@ public function str($current_indent, $indent)
     {
         $str = $this->getOutputComment($current_indent);
         $str .= $current_indent.sprintf('%s{', $this->getValueLabel()).PHP_EOL;
-        $str .= $this->childs->str($current_indent.$this->make_indent($indent), $indent);
+        $str .= $this->childs->str($current_indent.$this->makeIndent($indent), $indent);
         $str .= $current_indent.'}';
-        if(!$current_indent){
+        if (!$current_indent) {
             $str .= PHP_EOL;
         }
         return $str;
@@ -78,6 +81,4 @@ public function offsetUnset($offset)
     {
         unset($this->childs[$offset]);
     }
-
-
 }
diff --git a/src/PlantUMLParser/PUMLElementList.php b/src/PlantUMLParser/PUMLElementList.php
@@ -1,12 +1,14 @@
 <?php
 namespace Ateliee\PlantUMLParser;
+
 use Ateliee\PlantUMLParser\Exception\InvalidParamaterException;
 use Ateliee\PlantUMLParser\Exception\PUMLException;
 
 /**
  * @property PUMLElement[] $value
  */
-class PUMLElementList extends PUMLElement implements \ArrayAccess, \Countable {
+class PUMLElementList extends PUMLElement implements \ArrayAccess, \Countable
+{
 
     /**
      * PUMLElementList constructor.
@@ -23,19 +25,20 @@ public function __construct()
      * @throws PUMLException
      * @return $this
      */
-    public function add($elm){
+    public function add($elm)
+    {
 
         $elm = func_get_args();
-        if(count($elm) == 1){
+        if (count($elm) == 1) {
             $elm = current($elm);
         }
-        if(is_array($elm)){
-            foreach($elm as $e){
+        if (is_array($elm)) {
+            foreach ($elm as $e) {
                 $this->add($e);
             }
             return $this;
         }
-        if(!($elm instanceof PUMLElement)){
+        if (!($elm instanceof PUMLElement)) {
             throw new InvalidParamaterException();
         }
         $this->value[] = $elm;
@@ -50,7 +53,7 @@ public function add($elm){
     public function str($current_indent, $indent)
     {
         $str = $this->getOutputComment($current_indent);
-        foreach($this->value as $v){
+        foreach ($this->value as $v) {
             $str .= $v->str($current_indent, $indent).PHP_EOL;
         }
         return $str;

diff --git a/src/PlantUMLParser/PUMLKeyValue.php b/src/PlantUMLParser/PUMLKeyValue.php
@@ -1,7 +1,8 @@
 <?php
 namespace Ateliee\PlantUMLParser;
 
-class PUMLKeyValue extends PUMLElement {
+class PUMLKeyValue extends PUMLElement
+{
 
     /**
      * @var string $key
@@ -28,6 +29,4 @@ public function __toString()
     {
         return sprintf('%s %s', $this->key, $this->value);
     }
-
-
 }
diff --git a/src/PlantUMLParser/PUMLObject.php b/src/PlantUMLParser/PUMLObject.php
@@ -1,7 +1,8 @@
 <?php
 namespace Ateliee\PlantUMLParser;
 
-class PUMLObject extends PUMLElementBlock {
+class PUMLObject extends PUMLElementBlock
+{
 
     /**
      * @var string $name
@@ -36,14 +37,14 @@ public function __construct($type, $name, $alias = null, $attributes = null)
     /**
      * @return string
      */
-    public function getValueLabel(){
-        return sprintf('%s %s%s%s',
-                $this->value,
-                $this->alias ? "\"".$this->name."\"" : $this->name,
-                $this->alias ? ' as '.$this->alias : '',
-                $this->attributes ? ' '.$this->attributes : ''
-            );
+    public function getValueLabel()
+    {
+        return sprintf(
+            '%s %s%s%s',
+            $this->value,
+            $this->alias ? "\"".$this->name."\"" : $this->name,
+            $this->alias ? ' as '.$this->alias : '',
+            $this->attributes ? ' '.$this->attributes : ''
+        );
     }
-
-
 }
diff --git a/src/PlantUMLParser/PUMLParser.php b/src/PlantUMLParser/PUMLParser.php
@@ -7,7 +7,8 @@
 /**
  * Class PUMLParser
  */
-class PUMLParser extends PUMLParse {
+class PUMLParser extends PUMLParse
+{
 
     use PUMLOutputTrait;
 }
diff --git a/src/PlantUMLParser/PUMLStr.php b/src/PlantUMLParser/PUMLStr.php
@@ -1,7 +1,8 @@
 <?php
 namespace Ateliee\PlantUMLParser;
 
-class PUMLStr extends PUMLElement {
+class PUMLStr extends PUMLElement
+{
 
     public function str($current_indent, $indent)
     {