code fix

.coveralls.yml

@@ -1,5 +1,4 @@
 service_name: travis-pro
-repo_token: 6LgnNXDDHVZ6PMADr5ZB6yzXH9I6cKT7U
 coverage_clover: logs/clover.xml
 json_path: logs/coveralls-upload.json
 exclude_no_stmt: true

README.md

@@ -1,9 +1,9 @@
 # PlantUML parser for PHP
 
-[![Build Status](https://travis-ci.org/ateliee/plantuml-parser.svg?branch=development)](https://travis-ci.org/ateliee/plantuml-parser)
-[![Coverage Status](https://coveralls.io/repos/github/ateliee/plantuml-parser/badge.svg?branch=%28HEAD+detached+at+75dabae%29)](https://coveralls.io/github/ateliee/plantuml-parser?branch=%28HEAD+detached+at+75dabae%29)
+[![Build Status](https://travis-ci.com/ateliee/plantuml-parser.svg?branch=master)](https://travis-ci.com/ateliee/plantuml-parser)
+[![Coverage Status](https://coveralls.io/repos/github/ateliee/plantuml-parser/badge.svg?branch=master)](https://coveralls.io/github/ateliee/plantuml-parser?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/ateliee/plantuml-parser/v/stable)](https://packagist.org/packages/ateliee/plantuml-parser)
-[![Total Downloads](https://poser.pugx.org/ateliee/plantuml-parser/downloads)](https://packagist.org/packages/ateliee/plantuml-parser)
+![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)
 
 [PlantUML](http://plantuml.com/ja/)の書き込み・読み込みができるものがなかったので作成。
 
@@ -156,18 +156,6 @@ customer |o-ri-o{ order
 @enduml
 ```
 
-## コードチェック
-CodeSnifferを利用
-
-```
-# レポート出力
-composer report
-# 自動修正
-composer convert
-```
-
-
-
 ## 参考
 * [Plant UML](http://plantuml.com/ja/)
 * [Real World PlantUML](https://real-world-plantuml.com/)

composer.json

@@ -8,7 +8,10 @@
             "email": "info@ateliee.com"
         }
     ],
-    "keywords": ["PlantUML", "AsciiDoc"],
+    "keywords": [
+        "PlantUML",
+        "AsciiDoc"
+    ],
     "type": "library",
     "license": "MIT",
     "require": {
@@ -24,6 +27,7 @@
     "scripts": {
         "test": "phpunit",
         "check": "php vendor/bin/phpcs --standard=phpcs.xml",
+        "lint": "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",
         "convert": "php vendor/bin/phpcbf --standard=phpcs.xml"
     },
@@ -37,5 +41,14 @@
             "Ateliee\\": "src/",
             "Ateliee\\Tests\\": "tests/"
         }
+    },
+    "extra": {
+        "hooks": {
+            "pre-commit": [
+                "echo committing as $(git config user.name)",
+                "composer test",
+                "composer report"
+            ]
+        }
     }
-}
+}

example/load.php

@@ -3,21 +3,6 @@
 
 use Ateliee\PlantUMLParser\PUMLParser;
 
-
 $parser = new PUMLParser();
 $uml = $parser->loadFile(__DIR__.'/test.puml');
 $parser->save(__DIR__.'/test.puml', $uml);
-//
-//
-//$uml = "@startuml
-//Alice -> Bob: Authentication Request
-//Bob --> Alice: Authentication Response
-//
-//Alice -> Bob: Another authentication Request
-//Alice <-- Bob: another authentication Response
-//@enduml";
-//$parser = new PUMLParser();
-//
-//$result = $parser->parse($uml);
-//
-//var_dump($parser->output($result));

example/sample.php

@@ -63,4 +63,4 @@
 );
 
 $plant_uml = new PUMLParser();
-$plant_uml->save(__DIR__.'/test.puml', $uml);
+$plant_uml->save(__DIR__.'/test.puml', $uml);

example/save.php

@@ -127,4 +127,4 @@
 
 $parser = new PUMLParser();
 $parser->save(__DIR__.'/test.puml', $uml);
-var_dump($parser->output($uml));
+var_dump($parser->output($uml));

phpcs.xml

@@ -4,6 +4,8 @@
 
     <!-- 対象フォルダ -->
     <file>./src</file>
+    <file>./example</file>
+    <file>./tests</file>
 
     <!-- 除外したいファイル、ディレクトリ -->
     <exclude-pattern>*/database/*</exclude-pattern>

tests/Assert/PUMLBaseTest.php

@@ -1,5 +1,6 @@
 <?php
 namespace Ateliee\Tests;
+
 use Ateliee\PlantUMLParser\PUMLElementList;
 use Ateliee\PlantUMLParser\PUMLParser;
 
@@ -21,8 +22,8 @@ class PUMLAssert extends \PHPUnit_Framework_Assert
      *
      * @param string $uml
      */
-    public static function assertEncodeDecode($uml){
-
+    public static function assertEncodeDecode($uml)
+    {
         $parser = new PUMLParser();
 
         $result = $parser->loadString($uml);
@@ -37,4 +38,4 @@ public static function assertEncodeDecode($uml){
             $parser->output($result)
         );
     }
-}
+}

tests/PUMLElementTest.php

@@ -10,8 +10,8 @@
 use Ateliee\PlantUMLParser\PUMLParser;
 use Ateliee\PlantUMLParser\PUMLStr;
 
-class PUMLElementTest extends \PHPUnit_Framework_TestCase {
-
+class PUMLElementTest extends \PHPUnit_Framework_TestCase
+{
     public function testList()
     {
         $uml = new PUMLElementList();
@@ -99,8 +99,9 @@ public function testElementBlock()
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\InvalidParamaterException
      */
-    public function testInvalidParamaterException(){
+    public function testInvalidParamaterException()
+    {
         $uml = new PUMLElementList();
         $uml->add('test');
     }
-}
+}

tests/PUMLParserTest.php

@@ -5,13 +5,13 @@
 use Ateliee\PlantUMLParser\PUMLElementList;
 use Ateliee\PlantUMLParser\PUMLParser;
 
-class PUMLParserTest extends \PHPUnit_Framework_TestCase {
-
+class PUMLParserTest extends \PHPUnit_Framework_TestCase
+{
     public function testParamaters()
     {
         $parser = new PUMLParser();
         $uml = new PUMLElementList();
 
         $this->assertContainsOnly('string', [$parser->output($uml)]);
     }
-}
+}

tests/Parser/PUMLReadTest.php

@@ -5,8 +5,8 @@
 use Ateliee\PlantUMLParser\PUMLParser;
 use Ateliee\Tests\PUMLAssert;
 
-class PUMLReadTest extends \PHPUnit_Framework_TestCase {
-
+class PUMLReadTest extends \PHPUnit_Framework_TestCase
+{
     /**
      * シーケンス図の正常系テスト
      *
@@ -75,7 +75,8 @@ public function testEncode()
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\FileOpenException
      */
-    public function testFileOpenException(){
+    public function testFileOpenException()
+    {
 
         $parser = new PUMLParser();
         $parser->loadFile(null);
@@ -85,7 +86,8 @@ public function testFileOpenException(){
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\FileOpenException
      */
-    public function testFileOpenException2(){
+    public function testFileOpenException2()
+    {
 
         $parser = new PUMLParser();
         $parser->loadFile(__DIR__.'/a');
@@ -95,7 +97,8 @@ public function testFileOpenException2(){
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\InvalidParamaterException
      */
-    public function testInvalidParamaterException(){
+    public function testInvalidParamaterException()
+    {
 
         $parser = new PUMLParser();
         $parser->loadString(null);
@@ -106,7 +109,8 @@ public function testInvalidParamaterException(){
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\SyntaxException
      */
-    public function testSyntaxException(){
+    public function testSyntaxException()
+    {
 
         $parser = new PUMLParser();
         $parser->loadString("@startuml
@@ -119,7 +123,8 @@ public function testSyntaxException(){
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\SyntaxException
      */
-    public function testSyntaxException2(){
+    public function testSyntaxException2()
+    {
 
         $parser = new PUMLParser();
         $parser->loadString("@startuml
@@ -129,7 +134,8 @@ public function testSyntaxException2(){
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\SyntaxException
      */
-    public function testSyntaxException3(){
+    public function testSyntaxException3()
+    {
 
         $parser = new PUMLParser();
         $parser->loadString("@enduml");
@@ -138,10 +144,11 @@ public function testSyntaxException3(){
      * @test
      * @expectedException Ateliee\PlantUMLParser\Exception\SyntaxException
      */
-    public function testSyntaxException4(){
+    public function testSyntaxException4()
+    {
 
         $parser = new PUMLParser();
         $parser->loadString("@enduml
         aaaaa");
     }
-}
+}