updated Craft namespace, PHP version, craftcms version, phpcs.xml, re…

…moved deprecated.php
onyourmarks-agency · Mar 18, 2024 · 44ae2c7 · 44ae2c7
1 parent 5789aec
commit 44ae2c7
Show file tree

Hide file tree

Showing 10 changed files with 261 additions and 352 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # OYM - Geo Address Changelog
 
+## 3.0.0 - 2024-03-18
+### Updated
+- Updated Craft namespace to \Craft
+- Updated PHP version  to 8.2 or higher
+- Updated craftcms/cms version to 5.0.0-beta.1 or higher
+- Updated phpcs.xml
+
+### Removed
+- Removed deprecated.php
+
 ## 2.1.0 - 2024-03-04
 ### Updated
 - Updated TDE > OYM

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# OYM - Geo Address plugin for Craft CMS 4.x
+# OYM - Geo Address plugin for Craft CMS 5.x
 
-Geo Address field for Craft 4 Sections.
+Geo Address field for Craft CMS.
 
 ## Requirements
 
-This plugin requires Craft CMS 4.0.0 or later.
+This plugin requires Craft CMS 5.0.0 or later.
 
 ## Installation
 

diff --git a/composer.json b/composer.json
@@ -14,15 +14,14 @@
         }
     ],
     "require": {
-		"php": "^8.0",
-        "craftcms/cms": "^4.0.0",
-        "ext-curl": "*"
+        "php": "^8.2",
+        "ext-curl": "*",
+        "craftcms/cms": "^5.0.0-beta.1"
 	},
     "autoload": {
         "psr-4": {
           "oym\\craft\\geoaddress\\": "src/"
-        },
-        "files": ["src/deprecated.php"]
+        }
     },
     "extra": {
         "name": "OYM - Geo Address Fields",

diff --git a/geoaddress-sample.php b/geoaddress-sample.php
diff --git a/phpcs.xml b/phpcs.xml
@@ -8,5 +8,5 @@
 	<file>src/</file>
 
 	<exclude-pattern type="relative-root">*.js</exclude-pattern>
-	<exclude-pattern type="relative-root">deprecated.php</exclude-pattern>
+	<exclude-pattern type="relative-root">migrations/</exclude-pattern>
 </ruleset>
diff --git a/src/assetbundles/geoaddressfield/GeoAddressFieldAsset.php b/src/assetbundles/geoaddressfield/GeoAddressFieldAsset.php
@@ -2,7 +2,6 @@
 
 namespace oym\craft\geoaddress\assetbundles\geoaddressfield;
 
-use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 

diff --git a/src/deprecated.php b/src/deprecated.php
diff --git a/src/fields/GeoAddressField.php b/src/fields/GeoAddressField.php
@@ -4,7 +4,6 @@
 
 namespace oym\craft\geoaddress\fields;
 
-use Craft;
 use craft\base\ElementInterface;
 use craft\base\Field;
 use craft\base\PreviewableFieldInterface;
@@ -30,9 +29,9 @@ public function getInputHtml($value, ElementInterface $element = null): string
         }
 
         $id = Html::id($this->handle);
-        $namespacedId = Craft::$app->getView()->namespaceInputId($id);
+        $namespacedId = \Craft::$app->getView()->namespaceInputId($id);
 
-        return Craft::$app->getView()->renderTemplate(
+        return \Craft::$app->getView()->renderTemplate(
             'geoaddress/_components/fields/GeoAddressField_input',
             [
                 'name' => $this->handle,

diff --git a/src/migrations/m220516_144416_update_field_handle.php b/src/migrations/m220516_144416_update_field_handle.php
@@ -2,7 +2,6 @@
 
 namespace oym\craft\geoaddress\migrations;
 
-use Craft;
 use craft\db\Migration;
 use craft\db\Table;
 use oym\craft\geoaddress\fields\GeoAddressField;

diff --git a/src/services/GeoAddressService.php b/src/services/GeoAddressService.php
@@ -4,7 +4,6 @@
 
 namespace oym\craft\geoaddress\services;
 
-use Craft;
 use craft\base\Component;
 use oym\craft\geoaddress\GeoAddress;
 use oym\craft\geoaddress\models\GeoAddressModel;
@@ -41,8 +40,8 @@ public function getCoordsByAddress(string $addressQuery, string $country): array
 
         // no results
         if (!$result || $result['status'] !== 'OK' || empty($result['results'])) {
-            Craft::warning(
-                Craft::t(
+            \Craft::warning(
+                \Craft::t(
                     'geoaddress',
                     'GeoAddress coding failed: ' . $result['status']
                 ),