fixed non static

bakkerpeter · Jan 30, 2023 · cfa81ce · cfa81ce
1 parent bb7445f
commit cfa81ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/Components/Helpers/ApiHelper.php b/src/Components/Helpers/ApiHelper.php
@@ -125,8 +125,8 @@ public static function getMethod($queryType) {
      * @return string
      */
     public static function getModelPath($name) {
-        $model = Inflector::classify($name);
-        return "Afosto\ApiClient\Models\\" . Inflector::pluralize($model) . "\\" . $model;
+        $model = (\Doctrine\Inflector\InflectorFactory::create()->build())->classify($name);
+        return "Afosto\ApiClient\Models\\" . (\Doctrine\Inflector\InflectorFactory::create()->build())->pluralize($model) . "\\" . $model;
     }
 
     /**

diff --git a/src/Components/ModelTrait.php b/src/Components/ModelTrait.php
@@ -119,7 +119,7 @@ public function delete() {
      * @return string
      */
     public function getRoute() {
-        return strtolower(Inflector::pluralize($this->getName()));
+        return strtolower((\Doctrine\Inflector\InflectorFactory::create()->build())->pluralize($this->getName()));
     }
 
     /**

diff --git a/src/Components/Models/Relation.php b/src/Components/Models/Relation.php
@@ -34,9 +34,9 @@ class Relation extends Component {
     public function __construct(Model $source, $attribute) {
         list($this->model, $this->type) = $source->getRelations()[$attribute];
         if ($this->isRel()) {
-            $this->classPath = 'Afosto\ApiClient\Models\\' . Inflector::pluralize($this->_getModelForRel()) . '\\' . $this->model;
+            $this->classPath = 'Afosto\ApiClient\Models\\' . (\Doctrine\Inflector\InflectorFactory::create()->build())->pluralize($this->_getModelForRel()) . '\\' . $this->model;
         } else if ($this->isReference()) {
-            $this->classPath = 'Afosto\ApiClient\Models\\' . Inflector::pluralize($this->_getModelForReference()) . '\\' . $this->_getModelForReference();
+            $this->classPath = 'Afosto\ApiClient\Models\\' . (\Doctrine\Inflector\InflectorFactory::create()->build())->pluralize($this->_getModelForReference()) . '\\' . $this->_getModelForReference();
         } else {
             $this->classPath = $source->getNameSpace() . '\\' . $this->model;
         }

diff --git a/src/Components/WebhookTrait.php b/src/Components/WebhookTrait.php
@@ -32,7 +32,7 @@ abstract public function setAttributes($attributes);
      */
     public function getWebhookUrl($action) {
         $params = [
-            'model' => Inflector::tableize($this->getName()),
+            'model' => (\Doctrine\Inflector\InflectorFactory::create()->build())->tableize($this->getName()),
             'action' => $action,
         ];
         if (defined('WEBHOOK_KEY')) {

diff --git a/src/Generator/Definition.php b/src/Generator/Definition.php
@@ -143,7 +143,7 @@ private function _getName($name) {
      * @return string
      */
     private function _getNameSpace($name) {
-        return Inflector::pluralize(current(explode('_', $name)));
+        return (\Doctrine\Inflector\InflectorFactory::create()->build())->pluralize(current(explode('_', $name)));
     }
 
     /**

diff --git a/src/Generator/Generator.php b/src/Generator/Generator.php
@@ -160,7 +160,7 @@ private function _gatherPaths() {
         $this->_paths = [];
         foreach ($this->_swaggerSource['paths'] as $path => $pathData) {
             $path = current(explode('/', substr($path, 1)));
-            $this->_paths[] = \Doctrine\Inflector\Inflector::singularize($path);
+            $this->_paths[] = \Doctrine\Inflector\(\Doctrine\Inflector\InflectorFactory::create()->build())->singularize($path);
         }
         $this->_paths = array_unique($this->_paths);
     }