Merge pull request #32 from tbreuss/develop

Develop

composer.json

@@ -14,7 +14,7 @@
     "ext-json": "*",
     "psr/http-message": "^1.0",
     "psr/http-server-middleware": "^1.0",
-    "tebe/http-factory": "^0.8"
+    "tebe/http-factory": "^1.0"
   },
   "require-dev": {
     "phpmd/phpmd": "^2.6",

example/library/AuthLoggingEventHandler.php → example/components/AuthLoggingEventHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Tebe\Pvc\Application;
 use Tebe\Pvc\Event\Event;

example/library/HeaderMiddleware.php → example/components/HeaderMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

example/library/HtmlMiddleware.php → example/components/HtmlMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

example/library/HttpBasicAuthMiddleware.php → example/components/HttpBasicAuthMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

example/library/IpCheckEventHandler.php → example/components/IpCheckEventHandler.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Tebe\Pvc\Application;
 use Tebe\Pvc\Event\Event;
-use Tebe\Pvc\EventHandler;
+use Tebe\Pvc\Event\EventHandler;
 
 class IpCheckEventHandler implements EventHandler
 {

example/library/MyViewExtension.php → example/components/MyViewExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Tebe\Pvc\View\ViewExtension;
 use Tebe\Pvc\View\View;

example/library/ResponseTimeMiddleware.php → example/components/ResponseTimeMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace example\library;
+namespace example\components;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

example/public/index.php

@@ -4,17 +4,17 @@
 // adding namespace, usually done in composer.json
 $loader->setPsr4("example\\", __DIR__ . "/..");
 
-use example\library\HttpBasicAuthMiddleware;
-use example\library\HeaderMiddleware;
-use example\library\HtmlMiddleware;
-use example\library\ResponseTimeMiddleware;
-use example\library\AuthLoggingEventHandler;
-use example\library\MyViewExtension;
+use example\components\HttpBasicAuthMiddleware;
+use example\components\HeaderMiddleware;
+use example\components\HtmlMiddleware;
+use example\components\ResponseTimeMiddleware;
+use example\components\AuthLoggingEventHandler;
+use example\components\MyViewExtension;
 use Tebe\Pvc\Application;
 use Zend\Diactoros\ServerRequestFactory;
 
 try {
-    $config = require '../config/main.php';
+    $config = require __DIR__ . '/../config/main.php';
     $request = ServerRequestFactory::fromGlobals();
 
     Application::instance()

phpcs.xml

@@ -13,6 +13,8 @@
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 
     <!-- Paths to check -->
+    <file>example</file>
     <file>src</file>
     <file>tests</file>
+    <exclude-pattern>\.(css|js)</exclude-pattern>
 </ruleset>

phpunit.xml

@@ -4,4 +4,14 @@
             <directory>tests</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+            <directory>./example</directory>
+            <directory>./src</directory>
+            <exclude>
+                <directory>./tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>

tests/ApplicationTest.php

@@ -83,13 +83,8 @@ public function testAddEventHandler()
         $this->assertInstanceOf(Application::class, $this->app->addEventHandler('name', $eventHandler));
     }
 
-    // TODO implement test
-    public function testRun()
-    {
-    }
-
     public function testSetViewExtensions()
     {
-        $this->assertINstanceOf(Application::class, $this->app->setViewExtensions([]));
+        $this->assertInstanceOf(Application::class, $this->app->setViewExtensions([]));
     }
 }