Merge pull request #30 from philippebeck/dev

Release 0.4.7
philippebeck · Jul 16, 2019 · c7b825e · c7b825e
2 parents 37bdfec + 9071771
commit c7b825e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "pjs/pam",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "type": "project",
   "description": "Php Approachable Microframework",
   "keywords": [

diff --git a/composer.lock b/composer.lock
diff --git a/core/Controller/Controller.php b/core/Controller/Controller.php
@@ -58,7 +58,8 @@ public function url(string $page, array $params = [])
      */
     public function redirect(string $page, array $params = [])
     {
-        return header('Location: ' . $this->url($page, $params));
+        header('Location: ' . $this->url($page, $params));
+        exit;
     }
 
     /**
@@ -81,7 +82,7 @@ public function render(string $view, array $params = [])
     public function upload($fileDir)
     {
         $file           = filter_var_array($_FILES['file']);
-        $destination    = "__DIR__ . {$fileDir}/{$file['name']}";
+        $destination    = "{$fileDir}/{$file['name']}";
 
         try {
             if (!isset($file['error']) || is_array($file['error'])) {

diff --git a/core/Controller/CookieController.php b/core/Controller/CookieController.php
@@ -53,10 +53,7 @@ public function deleteCookie(string $name)
         if (filter_var($this->cookie[$name]) !== null) {
 
             $this->createCookie($name, '', time() - 3600);
-
-            return true;
         }
-        return false;
     }
 
     /**

diff --git a/core/View/CookieTwigExtension.php b/core/View/CookieTwigExtension.php
@@ -55,10 +55,7 @@ public function readAlert()
             if ($this->alert !== null) {
 
                 setcookie('alert', '', time() - 3600, '/');
-
-                return true;
             }
-            return false;
         }
     }
 }

diff --git a/project/composer.json b/project/composer.json
@@ -5,12 +5,11 @@
   "type": "website",
   "autoload": {
     "psr-4": {
-      "App\\": "src/",
-      "Pam\\": "vendor/pjs/pam/"
+      "App\\": "src/"
     }
   },
   "require": {
-    "pjs/pam": "^0.3.0"
+    "pjs/pam": "0.x"
   },
   "config": {
     "platform": {