Merge pull request #78 from philippebeck/dev

Release 4.1.0

README.md

@@ -150,11 +150,3 @@ Philippe Beck
 Code released under the MIT License
 
 [![GitHub License](https://img.shields.io/github/license/philippebeck/pam.svg?label=License)](https://github.com/philippebeck/pam/blob/master/LICENSE)
-
----
-
-## Support on Beerpay
-
-Hey dude! Help me out for a couple of :beers:!
-
-[![Beerpay](https://beerpay.io/philippebeck/pam/badge.svg?style=beer-square)](https://beerpay.io/philippebeck/pam)  [![Beerpay](https://beerpay.io/philippebeck/pam/make-wish.svg?style=flat-square)](https://beerpay.io/philippebeck/pam?focus=wish)

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "philippebeck/pam",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "type": "library",
   "description": "Php Approachable Microframework",
   "keywords": [
@@ -35,11 +35,14 @@
   },
   "require": {
     "php": "^7.3",
+    "ext-pdo": "*",
+    "ext-gd": "*",
+    "ext-exif": "*",
+    "ext-curl": "*",
+    "ext-json": "*",
     "google/recaptcha": "^1.2.4",
     "swiftmailer/swiftmailer": "^6.2.3",
-    "twig/twig": "^3.0.3",
-    "ext-gd": "*",
-    "ext-exif": "*"
+    "twig/twig": "^3.0.3"
   },
   "require-dev": {
     "tracy/tracy": "^2.7.5"

core/Controller/Globals/FilesManager.php

@@ -71,6 +71,14 @@ public function setFileExtension()
     {
         try {
             switch ($this->file["type"]) {
+                case "image/bmp":
+                    return ".bmp";
+                    break;
+
+                case "image/gif":
+                    return ".gif";
+                    break;
+
                 case "image/jpeg":
                     return ".jpg";
                     break;
@@ -79,8 +87,8 @@ public function setFileExtension()
                     return ".png";
                     break;
 
-                case "image/gif":
-                    return ".gif";
+                case "image/webp":
+                    return ".webp";
                     break;
 
                 default:

core/Controller/Service/CurlManager.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pam\Controller\Service;
+
+/**
+ * Class CurlManager
+ * @package Pam\Controller\Service
+ */
+class CurlManager
+{
+    /**
+     * @param string $url
+     * @param string $query
+     * @param string $key
+     * @return mixed
+     */
+    public function getApiData(string $url, string $query, string $key = NASA_API)
+    {
+        $curl = curl_init("https://" . $url . "?" . $query . "&api_key=" . $key);
+
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+
+        $data = curl_exec($curl);
+        curl_close($curl);
+
+        return json_decode($data, true);
+    }
+}

core/Controller/ServiceController.php

@@ -3,6 +3,7 @@
 namespace Pam\Controller;
 
 use Pam\Controller\Service\ArrayManager;
+use Pam\Controller\Service\CurlManager;
 use Pam\Controller\Service\ImageManager;
 use Pam\Controller\Service\MailManager;
 use Pam\Controller\Service\SecurityManager;
@@ -19,6 +20,11 @@ class ServiceController
      */
     private $array = null;
 
+    /**
+     * @var CurlManager
+     */
+    private $curl = null;
+
     /**
      * @var ImageManager
      */
@@ -45,6 +51,7 @@ class ServiceController
     public function __construct()
     {
         $this->array    = new ArrayManager();
+        $this->curl     = new CurlManager();
         $this->image    = new ImageManager();
         $this->mail     = new MailManager();
         $this->security = new SecurityManager();
@@ -59,6 +66,14 @@ public function getArray(): ArrayManager
         return $this->array;
     }
 
+    /**
+     * @return CurlManager
+     */
+    public function getCurl(): CurlManager
+    {
+        return $this->curl;
+    }
+
     /**
      * @return ImageManager
      */