Merge pull request #353 from weMail/hotfix/remove-deprecated-stringy-…

…plugin Remove stringy deprecated library.
weMail · May 21, 2024 · 8bb0644 · 8bb0644
2 parents 05bb2f3 + 346624a
commit 8bb0644
Show file tree

Hide file tree

Showing 11 changed files with 154 additions and 166 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,6 @@
   "require": {
     "php": ">=5.5",
     "league/csv": "^7.2",
-    "danielstjules/stringy": "~3.1.0",
     "appsero/client": "^1.1"
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/includes/Core/Api/Api.php b/includes/Core/Api/Api.php
@@ -2,14 +2,14 @@
 
 namespace WeDevs\WeMail\Core\Api;
 
-use Stringy\StaticStringy;
+use WeDevs\WeMail\Traits\Stringy;
 use WP_Error;
 use WeDevs\WeMail\Traits\Hooker;
 use WeDevs\WeMail\Traits\Singleton;
 
 class Api {
 
-    use Singleton;
+    use Singleton, Stringy;
 
     use Hooker;
 
@@ -124,7 +124,7 @@ public function has_api_key() {
      */
     public function __call( $name, $args ) {
         if ( ! method_exists( $this, $name ) ) {
-            $this->url .= '/' . StaticStringy::dasherize( $name );
+            $this->url .= '/' . $this->dasherize( $name );
 
             if ( $args ) {
                 $this->url .= '/' . array_pop( $args );

diff --git a/includes/Core/Form/Integrations/AbstractIntegration.php b/includes/Core/Form/Integrations/AbstractIntegration.php
@@ -2,10 +2,11 @@
 
 namespace WeDevs\WeMail\Core\Form\Integrations;
 
-use Stringy\StaticStringy;
+use WeDevs\WeMail\Traits\Stringy;
 use WP_Error;
 
 abstract class AbstractIntegration {
+    use Stringy;
 
     /**
      * Hold the value if plugin active or not
@@ -112,7 +113,7 @@ public function save( $data ) {
             $form_ids[] = $form_id;
         }
 
-        $response = wemail()->api->forms()->integrations( StaticStringy::dasherize( $this->slug ) )->post( $settings );
+        $response = wemail()->api->forms()->integrations( $this->dasherize( $this->slug ) )->post( $settings );
 
         if ( is_wp_error( $response ) ) {
             return $response;

diff --git a/includes/Core/Form/Integrations/Rest.php b/includes/Core/Form/Integrations/Rest.php
@@ -2,10 +2,11 @@
 
 namespace WeDevs\WeMail\Core\Form\Integrations;
 
-use Stringy\StaticStringy;
 use WeDevs\WeMail\RestController;
+use WeDevs\WeMail\Traits\Stringy;
 
 class Rest extends RestController {
+    use Stringy;
 
     /**
      * REST Base
@@ -35,12 +36,12 @@ class Rest extends RestController {
      * @return void|object
      */
     public function __get( $prop ) {
-        $integration = StaticStringy::underscored( $prop );
+        $integration = $this->underscored( $prop );
 
         if ( array_key_exists( $integration, $this->integrations ) ) {
             return $this->integrations[ $integration ];
         } elseif ( array_key_exists( $integration, wemail()->form->integrations() ) ) {
-            $class_name = StaticStringy::upperCamelize( $integration );
+            $class_name = $this->upperCamelize( $integration );
             $integration_class = "\\WeDevs\\WeMail\\Core\\Form\\Integrations\\$class_name";
             if ( class_exists( $integration_class ) ) {
                 $this->integrations[ $integration ] = $integration_class::instance();
@@ -114,7 +115,7 @@ public function forms( $request ) {
      */
     public function save( $request ) {
         $integration = $request->get_param( 'name' );
-        $integration = StaticStringy::underscored( $integration );
+        $integration = $this->underscored( $integration );
 
         if ( ! $this->$integration->is_active ) {
             return $this->$integration->inactivity_message();

diff --git a/includes/Core/Import/Import.php b/includes/Core/Import/Import.php
@@ -2,7 +2,6 @@
 
 namespace WeDevs\WeMail\Core\Import;
 
-use Stringy\StaticStringy;
 use WeDevs\WeMail\Traits\Singleton;
 
 class Import {

diff --git a/includes/Core/Settings/Settings.php b/includes/Core/Settings/Settings.php
@@ -2,12 +2,12 @@
 
 namespace WeDevs\WeMail\Core\Settings;
 
-use Stringy\StaticStringy;
 use WeDevs\WeMail\Traits\Core;
+use WeDevs\WeMail\Traits\Stringy;
 
 class Settings {
 
-    use Core;
+    use Core, Stringy;
 
     /**
      * Get site settings
@@ -19,7 +19,7 @@ class Settings {
      * @return array|string
      */
     public function get( $name ) {
-        $name = StaticStringy::underscored( $name );
+        $name = $this->underscored( $name );
 
         $settings = wemail()->api->settings()->$name()->get();