Removing deprecated methods from Inflector class

Author: Hackwar

src/Inflector.php

@@ -20,15 +20,6 @@
  */
 class Inflector extends DoctrineInflector
 {
-    /**
-     * The singleton instance.
-     *
-     * @var    Inflector
-     * @since  1.0
-     * @deprecated  3.0
-     */
-    private static $instance;
-
     /**
      * The inflector rules for countability.
      *
@@ -90,140 +81,6 @@ public function addCountableRule($data)
         return $this;
     }
 
-    /**
-     * Adds a specific singular-plural pair for a word.
-     *
-     * @param   string  $singular  The singular form of the word.
-     * @param   string  $plural    The plural form of the word. If omitted, it is assumed the singular and plural are identical.
-     *
-     * @return  $this
-     *
-     * @since   1.0
-     * @deprecated  3.0  Use Doctrine\Common\Inflector\Inflector::rules() instead.
-     */
-    public function addWord($singular, $plural = '')
-    {
-        trigger_deprecation(
-            'joomla/string',
-            '2.0.0',
-            '%s() is deprecated and will be removed in 3.0, use %s::rules() instead.',
-            __METHOD__,
-            DoctrineInflector::class
-        );
-
-        if ($plural !== '') {
-            static::rules(
-                'plural',
-                [
-                    'irregular' => [$plural => $singular],
-                ]
-            );
-
-            static::rules(
-                'singular',
-                [
-                    'irregular' => [$singular => $plural],
-                ]
-            );
-        } else {
-            static::rules(
-                'plural',
-                [
-                    'uninflected' => [$singular],
-                ]
-            );
-
-            static::rules(
-                'singular',
-                [
-                    'uninflected' => [$singular],
-                ]
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a pluralisation rule.
-     *
-     * @param   mixed  $data  A string or an array of regex rules to add.
-     *
-     * @return  $this
-     *
-     * @since   1.0
-     * @deprecated  3.0  Use Doctrine\Common\Inflector\Inflector::rules() instead.
-     */
-    public function addPluraliseRule($data)
-    {
-        trigger_deprecation(
-            'joomla/string',
-            '2.0.0',
-            '%s() is deprecated and will be removed in 3.0, use %s::rules() instead.',
-            __METHOD__,
-            DoctrineInflector::class
-        );
-
-        $this->addRule($data, 'plural');
-
-        return $this;
-    }
-
-    /**
-     * Adds a singularisation rule.
-     *
-     * @param   mixed  $data  A string or an array of regex rules to add.
-     *
-     * @return  $this
-     *
-     * @since   1.0
-     * @deprecated  3.0  Use Doctrine\Common\Inflector\Inflector::rules() instead.
-     */
-    public function addSingulariseRule($data)
-    {
-        trigger_deprecation(
-            'joomla/string',
-            '2.0.0',
-            '%s() is deprecated and will be removed in 3.0, use %s::rules() instead.',
-            __METHOD__,
-            DoctrineInflector::class
-        );
-
-        $this->addRule($data, 'singular');
-
-        return $this;
-    }
-
-    /**
-     * Gets an instance of the Inflector singleton.
-     *
-     * @param   boolean  $new  If true (default is false), returns a new instance regardless if one exists. This argument is mainly used for testing.
-     *
-     * @return  static
-     *
-     * @since   1.0
-     * @deprecated  3.0  Use static methods without a class instance instead.
-     */
-    public static function getInstance($new = false)
-    {
-        trigger_deprecation(
-            'joomla/string',
-            '2.0.0',
-            '%s() is deprecated and will be removed in 3.0.',
-            __METHOD__
-        );
-
-        if ($new) {
-            return new static();
-        }
-
-        if (!\is_object(self::$instance)) {
-            self::$instance = new static();
-        }
-
-        return self::$instance;
-    }
-
     /**
      * Checks if a word is countable.
      *
@@ -249,7 +106,7 @@ public function isCountable($word)
      */
     public function isPlural($word)
     {
-        return $this->toPlural($this->toSingular($word)) === $word;
+        return static::pluralize(static::singularize($word)) === $word;
     }
 
     /**
@@ -263,52 +120,6 @@ public function isPlural($word)
      */
     public function isSingular($word)
     {
-        return $this->toSingular($word) === $word;
-    }
-
-    /**
-     * Converts a word into its plural form.
-     *
-     * @param   string  $word  The singular word to pluralise.
-     *
-     * @return  string  The word in plural form.
-     *
-     * @since   1.0
-     * @deprecated  3.0  Use Doctrine\Common\Inflector\Inflector::pluralize() instead.
-     */
-    public function toPlural($word)
-    {
-        trigger_deprecation(
-            'joomla/string',
-            '2.0.0',
-            '%s() is deprecated and will be removed in 3.0, use %s::pluralize() instead.',
-            __METHOD__,
-            DoctrineInflector::class
-        );
-
-        return static::pluralize($word);
-    }
-
-    /**
-     * Converts a word into its singular form.
-     *
-     * @param   string  $word  The plural word to singularise.
-     *
-     * @return  string  The word in singular form.
-     *
-     * @since   1.0
-     * @deprecated  3.0  Use Doctrine\Common\Inflector\Inflector::singularize() instead.
-     */
-    public function toSingular($word)
-    {
-        trigger_deprecation(
-            'joomla/string',
-            '2.0.0',
-            '%s() is deprecated and will be removed in 3.0, use %s::singularize() instead.',
-            __METHOD__,
-            DoctrineInflector::class
-        );
-
-        return static::singularize($word);
+        return static::singularize($word) === $word;
     }
 }