Types

Author: Tam

composer.json

@@ -1,19 +1,20 @@
 {
   "name": "ether/simplemap",
-  "description": "A beautifully simple Map field type for Craft CMS 3",
-  "version": "3.9.3",
+  "description": "A beautifully simple Map field type for Craft CMS",
+  "version": "4.0.0",
   "type": "craft-plugin",
   "license": "proprietary",
   "minimum-stability": "dev",
   "require": {
-    "craftcms/cms": "^3.2.1",
+    "craftcms/cms": "^4.0.0",
     "mapkit/jwt": "^1.1.2",
     "geoip2/geoip2": "~2.0",
     "guzzlehttp/guzzle": "^6.3.3|^7.2.0",
     "what3words/w3w-php-wrapper": "3.*",
     "ext-openssl": "*",
     "ext-json": "*",
-    "ext-zlib": "*"
+    "ext-zlib": "*",
+    "php": "^8.0"
   },
   "autoload": {
     "psr-4": {
@@ -34,5 +35,11 @@
 
     "class": "ether\\simplemap\\SimpleMap",
     "schemaVersion": "3.4.2"
+  },
+  "config": {
+    "allow-plugins": {
+      "yiisoft/yii2-composer": true,
+      "craftcms/plugin-installer": true
+    }
   }
 }

src/SimpleMap.php

@@ -9,9 +9,9 @@
 namespace ether\simplemap;
 
 use Craft;
+use craft\base\Model;
 use craft\base\Plugin;
 use craft\events\RegisterComponentTypesEvent;
-use craft\events\RegisterGqlQueriesEvent;
 use craft\events\RegisterGqlTypesEvent;
 use craft\events\RegisterUrlRulesEvent;
 use craft\helpers\UrlHelper;
@@ -21,7 +21,6 @@
 use craft\web\twig\variables\CraftVariable;
 use craft\web\UrlManager;
 use ether\simplemap\fields\MapField as MapField;
-use ether\simplemap\integrations\craftql\GetCraftQLSchema;
 use ether\simplemap\integrations\feedme\FeedMeMaps;
 use ether\simplemap\integrations\graphql\MapPartsType;
 use ether\simplemap\integrations\graphql\MapType;
@@ -31,7 +30,9 @@
 use ether\simplemap\services\MapService;
 use ether\simplemap\services\StaticService;
 use ether\simplemap\web\Variable;
+use Exception;
 use yii\base\Event;
+use yii\base\InvalidConfigException;
 
 /**
  * Class SimpleMap
@@ -52,7 +53,7 @@ class SimpleMap extends Plugin
 	// Properties
 	// =========================================================================
 
-	public $hasCpSettings = true;
+	public bool $hasCpSettings = true;
 
 	// Static
 	// =========================================================================
@@ -116,15 +117,6 @@ public function init ()
 			);
 		}
 
-		if (class_exists(\markhuot\CraftQL\CraftQL::class))
-		{
-			Event::on(
-				MapField::class,
-				'craftQlGetFieldSchema',
-				[new GetCraftQLSchema, 'handle']
-			);
-		}
-
 		if (class_exists(\craft\feedme\Plugin::class))
 		{
 			Event::on(
@@ -150,39 +142,39 @@ public function init ()
 		}
 	}
 
-	protected function beforeUninstall (): bool
+	protected function beforeUninstall (): void
 	{
 		if ($this->getSettings()->geoLocationService === GeoLocationService::MaxMindLite)
 			GeoLocationService::purgeDb();
-
-		return parent::beforeUninstall();
 	}
 
 	// Settings
 	// =========================================================================
 
-	protected function createSettingsModel ()
+	protected function createSettingsModel (): Model
 	{
 		return new Settings();
 	}
 
 	/**
-	 * @return bool|\craft\base\Model|Settings
+	 * @return Model
 	 */
-	public function getSettings ()
+	public function getSettings (): Model
 	{
 		return parent::getSettings();
 	}
 
-	protected function settingsHtml ()
+	protected function settingsHtml (): ?string
 	{
 		// Redirect to our settings page
 		Craft::$app->controller->redirect(
 			UrlHelper::cpUrl('maps/settings')
 		);
+
+		return null;
 	}
 
-	public function afterSaveSettings ()
+	public function afterSaveSettings (): void
 	{
 		parent::afterSaveSettings();
 
@@ -210,7 +202,7 @@ public function onRegisterFieldTypes (RegisterComponentTypesEvent $event)
 	/**
 	 * @param Event $event
 	 *
-	 * @throws \yii\base\InvalidConfigException
+	 * @throws InvalidConfigException
 	 */
 	public function onRegisterVariable (Event $event)
 	{
@@ -232,7 +224,7 @@ public function onRegisterGqlTypes (RegisterGqlTypesEvent $event)
 	}
 
 	/**
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function onApplicationInit ()
 	{
@@ -243,12 +235,12 @@ public function onApplicationInit ()
 	// Helpers
 	// =========================================================================
 
-	public static function t ($message, $params = [])
+	public static function t ($message, $params = []): string
 	{
 		return Craft::t('simplemap', $message, $params);
 	}
 
-	public static function v ($version, $operator = '=')
+	public static function v ($version, $operator = '='): bool
 	{
 		return SimpleMap::getInstance()->is($version, $operator);
 	}

src/controllers/SettingsController.php

@@ -13,6 +13,7 @@
 use ether\simplemap\enums\MapTiles;
 use ether\simplemap\services\GeoLocationService;
 use ether\simplemap\SimpleMap;
+use yii\web\Response as YiiResponse;
 
 /**
  * Class SettingsController
@@ -23,10 +24,7 @@
 class SettingsController extends Controller
 {
 
-	/**
-	 * @return string
-	 */
-	public function actionIndex ()
+	public function actionIndex (): YiiResponse
 	{
 		return $this->renderTemplate(
 			'simplemap/settings',

src/controllers/StaticController.php

@@ -8,8 +8,10 @@
 
 namespace ether\simplemap\controllers;
 
+use Craft;
 use craft\web\Controller;
 use ether\simplemap\utilities\StaticMap;
+use Exception;
 use Yii;
 use yii\web\BadRequestHttpException;
 
@@ -22,15 +24,15 @@
 class StaticController extends Controller
 {
 
-	protected $allowAnonymous = true;
+	protected int|bool|array $allowAnonymous = true;
 
 	/**
 	 * @throws BadRequestHttpException
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function actionIndex ()
 	{
-		$request = \Craft::$app->getRequest();
+		$request = Craft::$app->getRequest();
 
 		if (!$request->validateCsrfToken($request->getRequiredQueryParam('csrf')))
 			throw new BadRequestHttpException(Yii::t('yii', 'Unable to verify your data submission.'));

src/enums/GeoService.php

@@ -42,7 +42,7 @@ abstract class GeoService
 	// Helpers
 	// =========================================================================
 
-	public static function getSelectOptions ()
+	public static function getSelectOptions (): array
 	{
 		$isLite = SimpleMap::v(SimpleMap::EDITION_LITE);
 

src/enums/MapTiles.php

@@ -11,6 +11,7 @@
 use ether\simplemap\models\Settings;
 use ether\simplemap\SimpleMap;
 use ether\simplemap\services\GeoService;
+use Exception;
 
 /**
  * Class MapTiles
@@ -74,7 +75,7 @@ abstract class MapTiles
 	// Methods
 	// =========================================================================
 
-	public static function getSelectOptions ()
+	public static function getSelectOptions (): array
 	{
 		$isLite = SimpleMap::v(SimpleMap::EDITION_LITE);
 
@@ -120,15 +121,15 @@ public static function getSelectOptions ()
 	 * Get the tiles url for the given type and scale
 	 *
 	 * @param string $type
-	 * @param int $scale
+	 * @param int    $scale
 	 *
 	 * @return array
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-	public static function getTiles ($type, $scale = 1)
+	public static function getTiles (string $type, int $scale = 1): array
 	{
 		$scale = $scale == 1 ? '.png' : '@2x.png';
-		$style = strpos($type, '.') !== false ? explode('.', $type, 2)[1] : '';
+		$style = str_contains($type, '.') ? explode('.', $type, 2)[1] : '';
 
 		switch ($type)
 		{
@@ -151,13 +152,13 @@ public static function getTiles ($type, $scale = 1)
 				];
 		}
 
-		throw new \Exception('Unknown tile type "' . $type . '"');
+		throw new Exception('Unknown tile type "' . $type . '"');
 	}
 
 	// Helpers
 	// =========================================================================
 
-	public static function pro ($label, $isLite)
+	public static function pro ($label, $isLite): array
 	{
 		return [
 			'label'    => SimpleMap::t($label) . ($isLite ? ' (Pro)' : ''),