Skip to content

Making locks not dependent on Semaphore extension #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moufmouf merged 1 commit into from
Apr 3, 2019
Merged

Making locks not dependent on Semaphore extension #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/GlobControllerQueryProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ final class GlobControllerQueryProvider implements QueryProviderInterface
* @param int|null $cacheTtl
* @param bool $recursive Whether subnamespaces of $namespace must be analyzed.
*/
public function __construct(string $namespace, FieldsBuilderFactory $fieldsBuilderFactory, RecursiveTypeMapperInterface $recursiveTypeMapper, ContainerInterface $container, CacheInterface $cache, ?int $cacheTtl = null, bool $recursive = true)
public function __construct(string $namespace, FieldsBuilderFactory $fieldsBuilderFactory, RecursiveTypeMapperInterface $recursiveTypeMapper, ContainerInterface $container, LockFactory $lockFactory, CacheInterface $cache, ?int $cacheTtl = null, bool $recursive = true)
{
$this->namespace = $namespace;
$this->container = $container;
Expand All @@ -78,9 +78,7 @@ public function __construct(string $namespace, FieldsBuilderFactory $fieldsBuild
$this->fieldsBuilderFactory = $fieldsBuilderFactory;
$this->recursiveTypeMapper = $recursiveTypeMapper;
$this->recursive = $recursive;
$store = new SemaphoreStore();
$this->lockFactory = new LockFactory($store);

$this->lockFactory = $lockFactory;
}

private function getAggregateControllerQueryProvider(): AggregateControllerQueryProvider
Expand Down
5 changes: 2 additions & 3 deletions src/Mappers/GlobTypeMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ final class GlobTypeMapper implements TypeMapperInterface
/**
* @param string $namespace The namespace that contains the GraphQL types (they must have a `@Type` annotation)
*/
public function __construct(string $namespace, TypeGenerator $typeGenerator, InputTypeGenerator $inputTypeGenerator, InputTypeUtils $inputTypeUtils, ContainerInterface $container, AnnotationReader $annotationReader, NamingStrategyInterface $namingStrategy, CacheInterface $cache, ?int $globTtl = 2, ?int $mapTtl = null, bool $recursive = true)
public function __construct(string $namespace, TypeGenerator $typeGenerator, InputTypeGenerator $inputTypeGenerator, InputTypeUtils $inputTypeUtils, ContainerInterface $container, AnnotationReader $annotationReader, NamingStrategyInterface $namingStrategy, LockFactory $lockFactory, CacheInterface $cache, ?int $globTtl = 2, ?int $mapTtl = null, bool $recursive = true)
{
$this->namespace = $namespace;
$this->typeGenerator = $typeGenerator;
Expand All @@ -142,8 +142,7 @@ public function __construct(string $namespace, TypeGenerator $typeGenerator, Inp
$this->inputTypeGenerator = $inputTypeGenerator;
$this->inputTypeUtils = $inputTypeUtils;
$this->recursive = $recursive;
$store = new SemaphoreStore();
$this->lockFactory = new LockFactory($store);
$this->lockFactory = $lockFactory;
}

/**
Expand Down
20 changes: 18 additions & 2 deletions src/SchemaFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
use Doctrine\Common\Annotations\Reader;
use Doctrine\Common\Annotations\AnnotationReader as DoctrineAnnotationReader;
use Doctrine\Common\Cache\ApcuCache;
use function extension_loaded;
use GraphQL\Type\SchemaConfig;
use Psr\Container\ContainerInterface;
use Psr\SimpleCache\CacheInterface;
use Symfony\Component\Lock\Factory as LockFactory;
use Symfony\Component\Lock\Store\FlockStore;
use Symfony\Component\Lock\Store\SemaphoreStore;
use function sys_get_temp_dir;
use TheCodingMachine\GraphQLite\Hydrators\FactoryHydrator;
use TheCodingMachine\GraphQLite\Hydrators\HydratorInterface;
use TheCodingMachine\GraphQLite\Mappers\CompositeTypeMapper;
Expand Down Expand Up @@ -72,6 +77,10 @@ class SchemaFactory
* @var SchemaConfig
*/
private $schemaConfig;
/**
* @var LockFactory
*/
private $lockFactory;

public function __construct(CacheInterface $cache, ContainerInterface $container)
{
Expand Down Expand Up @@ -181,6 +190,13 @@ public function createSchema(): Schema
$namingStrategy = $this->namingStrategy ?: new NamingStrategy();
$typeRegistry = new TypeRegistry();

if (extension_loaded('sysvsem')) {
$lockStore = new SemaphoreStore();
} else {
$lockStore = new FlockStore(sys_get_temp_dir());
}
$lockFactory = new LockFactory($lockStore);

$fieldsBuilderFactory = new FieldsBuilderFactory($annotationReader, $hydrator, $authenticationService,
$authorizationService, $typeResolver, $cachedDocBlockFactory, $namingStrategy);

Expand All @@ -192,7 +208,7 @@ public function createSchema(): Schema

foreach ($this->typeNamespaces as $typeNamespace) {
$typeMappers[] = new GlobTypeMapper($typeNamespace, $typeGenerator, $inputTypeGenerator, $inputTypeUtils,
$this->container, $annotationReader, $namingStrategy, $this->cache);
$this->container, $annotationReader, $namingStrategy, $lockFactory, $this->cache);
}

foreach ($this->typeMappers as $typeMapper) {
Expand All @@ -211,7 +227,7 @@ public function createSchema(): Schema
$queryProviders = [];
foreach ($this->controllerNamespaces as $controllerNamespace) {
$queryProviders[] = new GlobControllerQueryProvider($controllerNamespace, $fieldsBuilderFactory, $recursiveTypeMapper,
$this->container, $this->cache);
$this->container, $lockFactory, $this->cache);
}

foreach ($this->queryProviders as $queryProvider) {
Expand Down
17 changes: 17 additions & 0 deletions tests/AbstractQueryProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
use PHPUnit\Framework\TestCase;
use Psr\Container\ContainerInterface;
use Symfony\Component\Cache\Simple\ArrayCache;
use Symfony\Component\Lock\Factory as LockFactory;
use Symfony\Component\Lock\Store\FlockStore;
use Symfony\Component\Lock\Store\SemaphoreStore;
use TheCodingMachine\GraphQLite\Fixtures\TestObject;
use TheCodingMachine\GraphQLite\Fixtures\TestObject2;
use TheCodingMachine\GraphQLite\Fixtures\TestObjectWithRecursiveList;
Expand Down Expand Up @@ -50,6 +53,7 @@ abstract class AbstractQueryProviderTest extends TestCase
private $annotationReader;
private $typeResolver;
private $typeRegistry;
private $lockFactory;

protected function getTestObjectType(): MutableObjectType
{
Expand Down Expand Up @@ -318,4 +322,17 @@ protected function getTypeRegistry(): TypeRegistry
}
return $this->typeRegistry;
}

protected function getLockFactory(): LockFactory
{
if ($this->lockFactory === null) {
if (extension_loaded('sysvsem')) {
$lockStore = new SemaphoreStore();
} else {
$lockStore = new FlockStore(sys_get_temp_dir());
}
$this->lockFactory = new LockFactory($lockStore);
}
return $this->lockFactory;
}
}
2 changes: 1 addition & 1 deletion tests/GlobControllerQueryProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function has($id)
}
};

$globControllerQueryProvider = new GlobControllerQueryProvider('TheCodingMachine\\GraphQLite', $this->getControllerQueryProviderFactory(), $this->getTypeMapper(), $container, new NullCache());
$globControllerQueryProvider = new GlobControllerQueryProvider('TheCodingMachine\\GraphQLite', $this->getControllerQueryProviderFactory(), $this->getTypeMapper(), $container, $this->getLockFactory(), new NullCache());

$queries = $globControllerQueryProvider->getQueries();
$this->assertCount(6, $queries);
Expand Down
15 changes: 14 additions & 1 deletion tests/Integration/EndToEndTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\Cache\Simple\ArrayCache;
use Symfony\Component\Lock\Factory as LockFactory;
use Symfony\Component\Lock\Store\FlockStore;
use Symfony\Component\Lock\Store\SemaphoreStore;
use TheCodingMachine\GraphQLite\AnnotationReader;
use TheCodingMachine\GraphQLite\FieldsBuilderFactory;
use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Contact;
Expand Down Expand Up @@ -62,7 +65,7 @@ public function setUp()
},
QueryProviderInterface::class => function(ContainerInterface $container) {
return new GlobControllerQueryProvider('TheCodingMachine\\GraphQLite\\Fixtures\\Integration\\Controllers', $container->get(FieldsBuilderFactory::class),
$container->get(RecursiveTypeMapperInterface::class), $container->get(BasicAutoWiringContainer::class), new ArrayCache());
$container->get(RecursiveTypeMapperInterface::class), $container->get(BasicAutoWiringContainer::class), $container->get(LockFactory::class), new ArrayCache());
},
FieldsBuilderFactory::class => function(ContainerInterface $container) {
return new FieldsBuilderFactory(
Expand Down Expand Up @@ -110,6 +113,7 @@ public function setUp()
$container->get(BasicAutoWiringContainer::class),
$container->get(AnnotationReader::class),
$container->get(NamingStrategyInterface::class),
$container->get(LockFactory::class),
new ArrayCache()
);
},
Expand All @@ -121,6 +125,7 @@ public function setUp()
$container->get(BasicAutoWiringContainer::class),
$container->get(AnnotationReader::class),
$container->get(NamingStrategyInterface::class),
$container->get(LockFactory::class),
new ArrayCache()
);
},
Expand Down Expand Up @@ -163,6 +168,14 @@ public function setUp()
},
CachedDocBlockFactory::class => function() {
return new CachedDocBlockFactory(new ArrayCache());
},
LockFactory::class => function() {
if (extension_loaded('sysvsem')) {
$lockStore = new SemaphoreStore();
} else {
$lockStore = new FlockStore(sys_get_temp_dir());
}
return new LockFactory($lockStore);
}
]);

Expand Down
22 changes: 11 additions & 11 deletions tests/Mappers/GlobTypeMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testGlobTypeMapper()

$cache = new ArrayCache();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $inputTypeGenerator, $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $inputTypeGenerator, $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);

$this->assertSame([TestObject::class], $mapper->getSupportedClasses());
$this->assertTrue($mapper->canMapClassToType(TestObject::class));
Expand All @@ -43,7 +43,7 @@ public function testGlobTypeMapper()
$this->assertFalse($mapper->canMapNameToType('NotExists'));

// Again to test cache
$anotherMapperSameCache = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$anotherMapperSameCache = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);
$this->assertTrue($anotherMapperSameCache->canMapClassToType(TestObject::class));
$this->assertTrue($anotherMapperSameCache->canMapNameToType('Foo'));

Expand All @@ -61,7 +61,7 @@ public function testGlobTypeMapperDuplicateTypesException()

$typeGenerator = $this->getTypeGenerator();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\DuplicateTypes', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), new NullCache());
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\DuplicateTypes', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), new NullCache());

$this->expectException(DuplicateMappingException::class);
$mapper->canMapClassToType(TestType::class);
Expand All @@ -77,7 +77,7 @@ public function testGlobTypeMapperDuplicateInputTypesException()

$typeGenerator = $this->getTypeGenerator();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), new NullCache());
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), new NullCache());

$this->expectException(DuplicateMappingException::class);
$this->expectExceptionMessage('The class \'TheCodingMachine\GraphQLite\Fixtures\TestObject\' should be mapped to only one GraphQL Input type. Two methods are pointing via the @Factory annotation to this class: \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory::myFactory\' and \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory2::myFactory\'');
Expand All @@ -94,7 +94,7 @@ public function testGlobTypeMapperClassNotFoundException()

$typeGenerator = $this->getTypeGenerator();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\BadClassType', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), new NullCache());
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\BadClassType', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), new NullCache());

$this->expectException(ClassNotFoundException::class);
$this->expectExceptionMessage("Could not autoload class 'Foobar' defined in @Type annotation of class 'TheCodingMachine\\GraphQLite\\Fixtures\\BadClassType\\TestType'");
Expand All @@ -111,7 +111,7 @@ public function testGlobTypeMapperNameNotFoundException()

$typeGenerator = $this->getTypeGenerator();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), new NullCache());
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), new NullCache());

$this->expectException(CannotMapTypeException::class);
$mapper->mapNameToType('NotExists', $this->getTypeMapper());
Expand All @@ -132,7 +132,7 @@ public function testGlobTypeMapperInputType()

$cache = new ArrayCache();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);

$this->assertTrue($mapper->canMapClassToInputType(TestObject::class));

Expand All @@ -141,7 +141,7 @@ public function testGlobTypeMapperInputType()
$this->assertSame('TestObjectInput', $inputType->name);

// Again to test cache
$anotherMapperSameCache = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$anotherMapperSameCache = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);

$this->assertTrue($anotherMapperSameCache->canMapClassToInputType(TestObject::class));
$this->assertSame('TestObjectInput', $anotherMapperSameCache->mapClassToInputType(TestObject::class, $this->getTypeMapper())->name);
Expand All @@ -167,7 +167,7 @@ public function testGlobTypeMapperExtend()

$cache = new ArrayCache();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $inputTypeGenerator, $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $inputTypeGenerator, $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);

$type = $mapper->mapClassToType(TestObject::class, null, $this->getTypeMapper());

Expand All @@ -178,7 +178,7 @@ public function testGlobTypeMapperExtend()
$this->assertFalse($mapper->canExtendTypeForName('NotExists', $type, $this->getTypeMapper()));

// Again to test cache
$anotherMapperSameCache = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$anotherMapperSameCache = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Types', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);
$this->assertTrue($anotherMapperSameCache->canExtendTypeForClass(TestObject::class, $type, $this->getTypeMapper()));
$this->assertTrue($anotherMapperSameCache->canExtendTypeForName('TestObject', $type, $this->getTypeMapper()));

Expand All @@ -195,7 +195,7 @@ public function testEmptyGlobTypeMapper()

$cache = new ArrayCache();

$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Integration\Controllers', $typeGenerator, $inputTypeGenerator, $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $cache);
$mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\Integration\Controllers', $typeGenerator, $inputTypeGenerator, $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), $cache);

$this->assertSame([], $mapper->getSupportedClasses());
}
Expand Down
Loading