match php versions; use Url helper; use container where possible

Author: matthiez

composer.json

@@ -40,5 +40,5 @@
         "source": "https://github.com/sms77io/concrete5"
     },
     "type": "concrete5-package",
-    "version": "2.1.0"
+    "version": "2.2.0"
 }

controller.php

@@ -12,7 +12,7 @@
 
 final class Controller extends Package {
     /** @var string $MIN_PHP_VERSION */
-    private $MIN_PHP_VERSION = '7.3.0';
+    private $MIN_PHP_VERSION = '5.6.0';
 
     /** @var string $appVersionRequired */
     protected $appVersionRequired = '8.5.2';
@@ -26,19 +26,15 @@ final class Controller extends Package {
     protected $pkgHandle = 'sms77';
 
     /** @var string $pkgVersion */
-    protected $pkgVersion = '2.1.0';
+    protected $pkgVersion = '2.2.0';
 
-    /**
-     * @return mixed
-     */
+    /** @return string */
     public function getPackageDescription() {
         return t('Send SMS via Sms77.');
     }
 
-    /**
-     * @return string
-     */
-    public function getPackageName(){
+    /** @return string */
+    public function getPackageName() {
         return t('Sms77');
     }
 
@@ -74,16 +70,12 @@ private function commonTasks(PackageEntity $pkg) {
         }
     }
 
-    /**
-     * @throws Exception
-     */
-    public function install(){
+    /** @throws Exception */
+    public function install() {
         $this->commonTasks(parent::install());
     }
 
-    /**
-     * @throws Exception
-     */
+    /** @throws Exception */
     public function upgrade() {
         parent::upgrade();
 
@@ -97,7 +89,7 @@ public function uninstall() {
         parent::uninstall();
 
         /** @var Connection $db */
-        $db = \Database::connection();
+        $db = $this->app->make('database/connection');
         $db->createQueryBuilder()->delete('Config')
             ->where('configNamespace = :namespace')
             ->setParameters([':namespace' => $this->pkgHandle])->execute();

controllers/single_page/dashboard/sms77.php

@@ -2,6 +2,7 @@
 
 defined('C5_EXECUTE') or die('Access Denied.');
 
+use Concrete\Core\Support\Facade\Url;
 use Sms77\Concrete5\AbstractSinglePageDashboardController;
 use Sms77\Concrete5\Options;
 use Sms77\Concrete5\Routes;
@@ -24,7 +25,7 @@ public function submit(){
             $msg = t('Settings updated!');
         }
 
-        $to = Routes::getAbsoluteURL(Routes::$DASHBOARD);
+        $to = Url::to(Routes::$DASHBOARD);
         if ('' !== $msg) $to .= "?message=$msg";
 
         $this->redirect($to);

src/AbstractMessageController.php

@@ -4,6 +4,7 @@
 
 use Concrete\Core\Http\Client\Client;
 use Concrete\Core\Page\Page;
+use Concrete\Core\Support\Facade\Url;
 use Concrete\Core\User\Group\Group;
 use Concrete\Core\User\Group\GroupList;
 use Concrete\Core\User\UserInfo;
@@ -55,9 +56,7 @@ public function submit() {
         $this->view();
     }
 
-    /**
-     * @return array
-     */
+    /** @return array */
     protected function buildRecipients() {
         $to = [];
 
@@ -76,9 +75,7 @@ protected function buildRecipients() {
         return $to;
     }
 
-    /**
-     * @return string
-     */
+    /** @return string */
     protected function getText() {
         $text = $this->post('text', '');
 
@@ -109,7 +106,7 @@ public function on_start() {
     /** @return void */
     public function view() {
         if (!$this->client) {
-            $this->set('dashboardLink', Routes::getAbsoluteURL(Routes::$DASHBOARD));
+            $this->set('dashboardLink', URL::to(Routes::$DASHBOARD));
         }
 
         $this->set('group', $this->post('group', self::$ALL_GROUPS_ID));
@@ -161,9 +158,7 @@ private function initClient() {
         $this->client = new ApiClient($client, $this->apiKey);
     }
 
-    /**
-     * @param $msg
-     */
+    /** @param string|array|null $msg */
     protected function setMessage($msg) {
         $this->set('message', isset($msg)
             ? is_array($msg) ? implode(PHP_EOL, $msg) : $msg

src/Routes.php

@@ -2,7 +2,6 @@
 
 defined('C5_EXECUTE') or die('Access Denied.');
 
-use Concrete\Core\Page\Page;
 use ReflectionClass;
 
 abstract class Routes {
@@ -21,12 +20,4 @@ abstract class Routes {
     public static function all(){
         return (new ReflectionClass(static::class))->getStaticProperties();
     }
-
-    /**
-     * @param string $route
-     * @return string
-     */
-    public static function getAbsoluteURL($route) {
-        return Page::getByPath($route)->getCollectionLink();
-    }
 }