Close #177

Author: neomerx

src/Schema/Container.php

@@ -81,12 +81,12 @@ public function register($type, $schema)
 
         $isOk = (
             (is_string($schema) === true && empty($schema) === false) ||
-            $schema instanceof Closure ||
+            is_callable($schema) ||
             $schema instanceof SchemaProviderInterface
         );
         if ($isOk === false) {
             throw new InvalidArgumentException(T::t(
-                'Schema for type \'%s\' must be non-empty string, Closure or SchemaProviderInterface instance.',
+                'Schema for type \'%s\' must be non-empty string, callable or SchemaProviderInterface instance.',
                 [$type]
             ));
         }
@@ -146,11 +146,12 @@ public function getSchemaByType($type)
             throw new InvalidArgumentException(T::t('Schema is not registered for type \'%s\'.', [$type]));
         }
 
-        $classNameOrClosure = $this->getProviderMapping($type);
-        if ($classNameOrClosure instanceof Closure) {
-            $schema = $this->createSchemaFromClosure($classNameOrClosure);
+        $classNameOrCallable = $this->getProviderMapping($type);
+        if (is_string($classNameOrCallable) === true) {
+            $schema = $this->createSchemaFromClassName($classNameOrCallable);
         } else {
-            $schema = $this->createSchemaFromClassName($classNameOrClosure);
+            assert('is_callable($classNameOrCallable) === true');
+            $schema = $this->createSchemaFromCallable($classNameOrCallable);
         }
         $this->setCreatedProvider($type, $schema);
 
@@ -313,6 +314,7 @@ protected function getResourceType($resource)
     }
 
     /**
+     * @deprecated Use `createSchemaFromCallable` method instead.
      * @param Closure $closure
      *
      * @return SchemaProviderInterface
@@ -324,6 +326,19 @@ protected function createSchemaFromClosure(Closure $closure)
         return $schema;
     }
 
+    /**
+     * @param callable $callable
+     *
+     * @return SchemaProviderInterface
+     */
+    protected function createSchemaFromCallable(callable $callable)
+    {
+        $schema = $callable instanceof Closure ?
+            $this->createSchemaFromClosure($callable) : call_user_func($callable, $this->getFactory());
+
+        return $schema;
+    }
+
     /**
      * @param string $className
      *

tests/Schema/ContainerTest.php

@@ -138,4 +138,28 @@ public function testRegisterSchemaInstance()
 
         $this->assertSame($authorSchema, $container->getSchema(new Author()));
     }
+
+    /**
+     * Test container.
+     *
+     * @link https://github.com/neomerx/json-api/issues/177
+     */
+    public function testRegisterCallableSchemeFactory()
+    {
+        $container = new Container($this->factory, [
+            Author::class => [static::class, 'AuthorShemeFactory'],
+        ]);
+
+        $this->assertNotNull($container->getSchema(new Author()));
+    }
+
+    /**
+     * @param SchemaFactoryInterface $factory
+     *
+     * @return AuthorSchema
+     */
+    public static function AuthorShemeFactory(SchemaFactoryInterface $factory)
+    {
+        return new AuthorSchema($factory);
+    }
 }