Patched (and better documented) custom naming strategy bug.

Author: furey

README.md

@@ -150,11 +150,15 @@ return [
     ],
 
     /**
-     * Model shortcut naming strategy (e.g. 'App\User' = '$u', 'u()').
-     * Supported: 'pascal', 'shortestUnique'
-     * Also supports any resolvable full class name implementing 'Ajthinking\Tinx\Naming\Strategy'.
+     * Model shortcut naming strategy (e.g. 'App\User' = '$u', '$u_', 'u()').
+     * Supported values: 'pascal', 'shortestUnique'
      * */
     'strategy' => 'pascal',
+    /**
+     * Alternatively, you may pass a resolvable fully qualified class name
+     * implementing 'Ajthinking\Tinx\Naming\Strategy'.
+     * */
+    // 'strategy' => App\CustomNamingStrategy::class,
 
     /**
      * Column name (e.g. 'id', 'created_at') used to determine last model shortcut (i.e. '$u_').

config/tinx.php

@@ -29,11 +29,15 @@
     ],
 
     /**
-     * Model shortcut naming strategy (e.g. 'App\User' = '$u', 'u()').
-     * Supported: 'pascal', 'shortestUnique'
-     * Also supports any resolvable full class name implementing 'Ajthinking\Tinx\Naming\Strategy'.
+     * Model shortcut naming strategy (e.g. 'App\User' = '$u', '$u_', 'u()').
+     * Supported values: 'pascal', 'shortestUnique'
      * */
     'strategy' => 'pascal',
+    /**
+     * Alternatively, you may pass a resolvable fully qualified class name
+     * implementing 'Ajthinking\Tinx\Naming\Strategy'.
+     * */
+    // 'strategy' => App\CustomNamingStrategy::class,
 
     /**
      * Column name (e.g. 'id', 'created_at') used to determine last model shortcut (i.e. '$u_').

src/Naming/StrategyFactory.php

@@ -47,8 +47,11 @@ private static function resolveViaContainer($strategy, $models)
         /**
          * This is the same as calling Laravel's "app()" helper,
          * but we don't have that framework function available.
+         * The make method check supports legacy Laravel installs.
          * */
-        $instance = Container::getInstance()->make($strategy, [$models]);
+        $container = Container::getInstance();
+        $makeMethod = method_exists($container, 'makeWith') ? 'makeWith' : 'make';
+        $instance = $container->$makeMethod($strategy, ['models' => $models]);
 
         if ($instance instanceof Strategy) {
             return $instance;