Merge branch 'release/0.3.0'

.gitignore

@@ -1,5 +1,4 @@
 /.vscode/
-*.log
 *.cache
 /vendor/
 /tmp/cache/twig/*

.travis.yml

@@ -1,11 +1,18 @@
 language: php
 
 php:
-  - nightly
+  7.1.9
 
 install:
   - composer install
   - composer dump -o
 
+cache:
+  directories:
+  - vendor
+
 script:
-  ./vendor/bin/phpunit
+  ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
+after_success:
+  travis_retry php vendor/bin/php-coveralls

README.md

@@ -4,6 +4,8 @@ Le framework phpGone est en cours de développement, la documentation sera écri
 ## Statut de build
 * Master : [![Build Status](https://travis-ci.org/beMang/phpgone.svg?branch=master)](https://travis-ci.org/beMang/phpgone)
 * Branch dev : [![Build Status](https://travis-ci.org/beMang/phpgone.svg?branch=develop)](https://travis-ci.org/beMang/phpgone)
+* Code coverage branch master : [![Coverage Status](https://coveralls.io/repos/github/beMang/phpgone/badge.svg?branch=master)](https://coveralls.io/github/beMang/phpgone?branch=master)
+* Code coverage branch dev : [![Coverage Status](https://coveralls.io/repos/github/beMang/phpgone/badge.svg?branch=develop)](https://coveralls.io/github/beMang/phpgone?branch=develop)
 
 **Cette page est totalement dépréciée**
 

app/Controllers/Show/Show.php

@@ -9,4 +9,9 @@ public function executeIndex(\Psr\Http\Message\ServerRequestInterface $request)
     {
         $this->getRenderer()->twigRender('Show/index.twig', []);
     }
+
+    public function executeDoc(\Psr\Http\Message\ServerRequestInterface $request){
+        $this->getRenderer()->twigRender('Show/index.twig', []);
+        $this->getRenderer()->render('Show/doc', []);
+    }
 }

app/config.php

@@ -6,7 +6,8 @@
     'defaultMainRender' => 'Twig',
     'defaultAsset' => 'site',
     'routes' => [
-        new Route('^[\/]$', 'Show\Show', 'index', ['test'])
+        new Route('^[\/]$', 'Show\Show', 'index', ['test']),
+        new Route('/doc', 'Show\Show', 'Doc', [])
     ],
     'viewError404' => 'Error/show.twig'
 ];

app/views/Show/doc.php

@@ -0,0 +1 @@
+<h1>La documentation va être écrite</h1>

composer.json

@@ -13,7 +13,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5",
-        "squizlabs/php_codesniffer": "^3.0@dev"
+        "squizlabs/php_codesniffer": "^3.0@dev",
+        "php-coveralls/php-coveralls": "2.0.x-dev"
     },
     "autoload": {
         "psr-4": {
@@ -22,4 +23,4 @@
             "phpGoneHelpers\\": "core/Helpers"
         }
     }
-}
+}

core/Core/Application.php

@@ -74,7 +74,7 @@ public function run()
     public function send()
     {
         $responseSender = new \phpGone\Core\ResponseSender();
-        $responseSender->send($this->httpResponse);
+        return $responseSender->send($this->httpResponse);
     }
 
     public function setHttpResponse(\Psr\Http\Message\ResponseInterface $response)

core/Core/ApplicationComponent.php

@@ -51,9 +51,4 @@ public function getConfig()
     {
         return $this->getApp()->getConfig();
     }
-
-    public function setApp(\phpGone\Core\Application $app)
-    {
-        $this->app = $app;
-    }
 }

core/Core/BackController.php

@@ -54,20 +54,6 @@ public function execute()
         $this->$method($this->app->getRequest());
     }
 
-    /**
-     * Défini le module du controller
-     *
-     * @param string $module Module à définir
-     * @return \InvalidArgumentException Si erreur
-     */
-    public function setModule($module)
-    {
-        if (!is_string($module) || empty($module)) {
-            throw new \InvalidArgumentException('Le module doit être une chaine de caractères valide');
-        }
-        $this->module = $module;
-    }
-
     /**
      * Défini l'action à executer
      *

core/Core/Config.php

@@ -7,16 +7,11 @@ class Config
     protected $config = [];
     protected $configFiles;
 
-    public function getConfig()
+    public function getConfigArray()
     {
         return $this->config;
     }
 
-    public function getConfigFile()
-    {
-        return $this->configFiles;
-    }
-
     public function get($key)
     {
         if (!empty($this->config[$key])) {

core/Core/MiddlewaresDispatcher.php

@@ -23,7 +23,7 @@ class MiddlewaresDispatcher extends ApplicationComponent
      *
      * @var string[]
      */
-    protected $middlewares = ['CoreMiddleware', 'NotFoundMiddleware'];
+    protected $middlewares = [\phpGone\Middlewares\CoreMiddleware::class, \phpGone\Middlewares\NotFoundMiddleware::class];
 
     /**
      * Index à utiliser pour parcourir les middlwares
@@ -53,7 +53,7 @@ public function process(\Psr\Http\Message\ServerRequestInterface $request)
     {
         $middleware = $this->getMiddleware();
         if (is_null($middleware)) {
-            return false;
+            throw new \RuntimeException('Aucun middleware a été défini');
         }
         return call_user_func_array($middleware, [$request, [$this, 'process']]);
     }
@@ -66,7 +66,7 @@ public function process(\Psr\Http\Message\ServerRequestInterface $request)
     private function getMiddleware()
     {
         if (array_key_exists($this->middlewaresIndex, $this->middlewares)) {
-            $middleWareClass = '\\phpGone\Middlewares\\' . $this->middlewares[$this->middlewaresIndex];
+            $middleWareClass = $this->middlewares[$this->middlewaresIndex];
             $middleware = new $middleWareClass($this->getApp());
             $this->middlewaresIndex++;
             return $middleware;

core/Core/ResponseSender.php

@@ -29,5 +29,6 @@ public function send(\Psr\Http\Message\ResponseInterface $response)
         while (!$stream->eof()) {
             echo $stream->read(1024 * 8);
         }
+        return true;
     }
 }

core/Core/baseConfig.php

@@ -9,20 +9,8 @@
  * @author Antonutti Adrien <antonuttiadrien@email.com>
  */
 
- //USAGE
-
-use phpGone\Log\Logger;
-use phpGone\Router\Routeur;
-use phpGone\Session\Session;
-use GuzzleHttp\Psr7\Response;
-use phpGone\Core\Application;
-use phpGone\Renderer\PhpRenderer;
-use phpGone\Database\DatabasePDO;
-use phpGone\Renderer\TwigRenderer;
-use phpGone\Core\MiddlewaresDispatcher;
-
 return[
     'TwigExtensions' => [
-        phpGone\Renderer\TwigExtensions\FormExtension::class
+        phpGone\Renderer\TwigExtensions\UrlExtension::class
     ]
 ];

core/Session/Session.php → core/Helpers/Session.php

@@ -8,15 +8,14 @@
  * @copyright 2017 Antonutti Adrien
  * @author Antonutti Adrien <antonuttiadrien@email.com>
  */
-namespace phpGone\Session;
+namespace phpGone\Helpers;
 
 /**
  * Class Session
  * Gestion des sessions simples (pour l'utiliser le session_start() doit être bien démarré)
  */
-class Session
+class Session extends Helper
 {
-    use FlashTrait;
     /**
      * Ajoute un attribut à la session
      *
@@ -63,7 +62,7 @@ public function getAttr($key)
      * @param string $key Clé de l'attribut à supprimer
      * @return void
      */
-    public function removeAttr($attr) :void
+    public function removeAttr($key) :void
     {
         unset($_SESSION[$key]);
     }

core/Helpers/Url.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace phpGone\Helpers;
+
+use phpGone\Helpers\Helper;
+
+class Url extends Helper{
+    public function getTmpPath(){
+        return __DIR__ . '/../../tmp/';
+    }
+
+    public function getAppPath(){
+        return __DIR__ . '/../../app/';
+    }
+
+    public function getTestsPath(){
+        return __DIR__ . '/../../tests/';
+    }
+}