Update PHPUnit tests

ma-si · Mar 12, 2017 · 46cb2c8 · 46cb2c8
1 parent 037b33d
commit 46cb2c8
Show file tree

Hide file tree

Showing 15 changed files with 4,242 additions and 54 deletions.
diff --git a/.docheader b/.docheader
@@ -0,0 +1,7 @@
+/**
+ * AistGitTools (http://mateuszsitek.com/projects/aist-git-tools)
+ *
+ * @link      http://github.com/ma-si/aist-git-tools for the canonical source repository
+ * @copyright Copyright (c) 2006-%year% Aist Internet Technologies (http://aist.pl) All rights reserved.
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
+ */
diff --git a/.formatter.yml b/.formatter.yml
@@ -7,6 +7,6 @@ header: |
      * AistGitTools (http://mateuszsitek.com/projects/aist-git-tools)
      *
      * @link      http://github.com/ma-si/aist-git-tools for the canonical source repository
-     * @copyright Copyright (c) 2006-2016 Aist Internet Technologies (http://aist.pl) All rights reserved.
+     * @copyright Copyright (c) 2006-2017 Aist Internet Technologies (http://aist.pl) All rights reserved.
      * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
      */
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
-/nbproject/private/
 build
-phpunit.xml
+phpunit.xml
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2016, Aist Internet Technologies | Mateusz Sitek
+Copyright (c) 2006-2017, Aist Internet Technologies | Mateusz Sitek
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Module providing git toolbar for the [Zend Developer Tools](https://github.com/z
 
 About
 =====
-Information of the application repository data like this :
+Information of the application repository data like this:
 
 ![git toolbar for zend developer tools](https://github.com/ma-si/aist-git-tools/blob/master/data/docs/toolbar.png)
 
@@ -28,6 +28,8 @@ Information of the application repository data like this :
 - [x] enabled hooks list
 - [x] remotes list
 - [x] zend component installer
+- [ ] git time metrics (GTM)
+- [ ] git flow
 
 
 Installation
@@ -36,8 +38,8 @@ Installation of this module uses composer. For composer documentation, please re
 [getcomposer.org](http://getcomposer.org/).
 
 1. Install the module via composer by running:
-    ```sh
-    $ composer require aist/aist-git-tools dev-master
+    ```bash
+    composer require aist/aist-git-tools dev-master
     ```
    or download it directly from github and place it in your application's `module/` directory.
 2. Add the `AistGitTools` module to the module section of your `config/application.config.php`

diff --git a/composer.json b/composer.json
@@ -18,11 +18,10 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "gitonomy/gitlib": ">=0.1.7",
-        "zendframework/zend-developer-tools": "dev-master",
         "zendframework/zend-filter": "^2.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.3",
+        "phpunit/phpunit": "5.*",
         "squizlabs/php_codesniffer": "^2.6",
         "phpmd/phpmd": "^2.4",
         "pdepend/pdepend": "^2.2",
@@ -31,10 +30,9 @@
         "phpspec/phpspec": "^2.5",
         "behat/behat": "^3.1",
         "mmoreram/php-formatter": "dev-master",
-        "psr/log": "^1.0"
-    },
-    "config": {
-        "bin-dir": "bin"
+        "psr/log": "^1.0",
+        "malukenho/docheader": "^0.1.5",
+        "zendframework/zend-developer-tools": "^1.1"
     },
     "extra": {
         "zf": {
@@ -48,29 +46,43 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "AistGitToolsTest\\": "test/"
+            "AistGitToolsTest\\": "test/src/"
         }
     },
     "scripts": {
         "post-update-cmd": [
-            "@fix"
+            "@fix",
+            "@test"
         ],
         "fix": [
             "@header-fix",
             "@use-sort",
-            "@header-fix-tests",
-            "@use-sort-tests"
+            "@header-check"
+        ],
+        "header-fix": [
+            "php-formatter formatter:header:fix src",
+            "php-formatter formatter:header:fix config",
+            "php-formatter formatter:header:fix test"
+        ],
+        "use-sort": [
+            "php-formatter formatter:use:sort src",
+            "php-formatter formatter:use:sort config",
+            "php-formatter formatter:use:sort test"
+        ],
+        "header-check": [
+            "docheader check src",
+            "docheader check config",
+            "docheader check test"
         ],
-        "header-fix": "bin/php-formatter formatter:header:fix src/",
-        "use-sort": "bin/php-formatter formatter:use:sort src/",
-        "header-fix-tests": "bin/php-formatter formatter:header:fix test/",
-        "use-sort-tests": "bin/php-formatter formatter:use:sort test/",
         "check": [
-            "@cs",
-            "@test"
+            "@cs-check",
+            "@header-check"
         ],
-        "cs": "phpcs",
-        "cs-fix": "phpcbf",
-        "test": "phpunit"
+        "cs-check": "phpcs src config test",
+        "cs-fix": "phpcbf src config test",
+        "test":  [
+            "@check",
+            "phpunit"
+        ]
     }
 }