Symfony 4.0 compat (#185)

* Allow symfony 4.0 components as deps, adjust tests, allow to define directories to be scanned for annotations
* Made README more clear about symfony version support

Author: pinkeen

.travis.yml

@@ -10,12 +10,16 @@ php:
     - hhvm
 
 matrix:
+    include:
+        - php: 7.1
+          env: DEPENDENCIES=beta
     allow_failures:
         - php: hhvm
 
 install:
   - sh -c "sudo apt-get -y install uuid-dev libgearman-dev gearman gearman-job-server"
 before_script:
+  - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
   - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then curl -L -o gearman.tgz http://pecl.php.net/get/gearman/1.1.2; fi;
   - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then curl -L -o gearman.tgz https://github.com/wcgallego/pecl-gearman/archive/gearman-2.0.1.tar.gz; fi;
   - tar -xzf gearman.tgz

DependencyInjection/Configuration.php

@@ -55,6 +55,9 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
+                ->arrayNode('resources')
+                    ->scalarPrototype()->end()
+                ->end()
                 ->arrayNode('servers')
                     ->performNoDeepMerging()
                     ->defaultValue(array(

DependencyInjection/GearmanExtension.php

@@ -48,6 +48,11 @@ public function load(array $config, ContainerBuilder $container)
             $config['bundles']
         );
 
+        $container->setParameter(
+            'gearman.resources',
+            $config['resources']
+        );
+
         $container->setParameter(
             'gearman.servers',
             $config['servers']

README.md

@@ -1,4 +1,4 @@
-GearmanBundle for Symfony2/3
+GearmanBundle for Symfony2, 3 and 4
 =====
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cf3d97c6-e026-4489-8493-a3f4a1e75a68/mini.png)](https://insight.sensiolabs.com/projects/cf3d97c6-e026-4489-8493-a3f4a1e75a68)
 [![Build Status](https://travis-ci.org/mmoreram/GearmanBundle.png?branch=master)](https://travis-ci.org/mmoreram/GearmanBundle)
@@ -8,7 +8,7 @@ GearmanBundle for Symfony2/3
 [![License](https://poser.pugx.org/mmoreram/gearman-bundle/license.png)](https://packagist.org/packages/mmoreram/gearman-bundle)
 [![Total Downloads](https://poser.pugx.org/mmoreram/gearman-bundle/downloads.png)](https://packagist.org/packages/mmoreram/gearman-bundle)
 
-GearmanBundle is a bundle for Symfony2/3 intended to provide an easy way to 
+GearmanBundle is a bundle for Symfony2/3/4 intended to provide an easy way to 
 support developers who need to use job queues. For example: mail queues, Solr 
 generation queues or Database upload queues.
 
@@ -22,7 +22,9 @@ them with us, don't hesitate to open a RFC issue or a Pull Request.
 
 Tags
 ----
-* Use tags under 4.X for Symfony2.X versions.  4.X support Symfony 3.X+
+* Symfony 4.0 is supported by tags 4.1+ (they still work with Symfony 3.X)
+* All 4.X tags support Symfony 3.X
+* Use tags lower than 4.X for Symfony 2.X versions 
 * Use last unstable version ( alias of `dev-master` ) to stay always in last commit
 * Use last stable version tag to stay in a stable release.
 * [![Latest Unstable Version](https://poser.pugx.org/mmoreram/gearman-bundle/v/unstable.png)](https://packagist.org/packages/mmoreram/gearman-bundle)  [![Latest Stable Version](https://poser.pugx.org/mmoreram/gearman-bundle/v/stable.png)](https://packagist.org/packages/mmoreram/gearman-bundle)

Resources/config/eventDispatchers.yml

@@ -11,3 +11,4 @@ services:
     gearman.dispatcher.callbacks:
         parent: gearman.dispatcher.abstract
         class: "%gearman.dispatcher.callbacks.class%"
+        public: true

Resources/config/generators.yml

@@ -5,5 +5,6 @@ services:
     #
     gearman.unique_job_identifier:
         class: "%gearman.unique_job_identifier.class%"
+        public: true
         arguments:
             - "%gearman.default.settings.generate_unique_key%"

Resources/config/services.yml

@@ -5,16 +5,19 @@ services:
     #
     gearman.parser:
         class: "%gearman.parser.class%"
+        public: true
         arguments:
             - "@kernel"
             - "@annotation_reader"
             - "@gearman.external.symfony_finder"
             - "%gearman.bundles%"
+            - "%gearman.resources%"
             - "%gearman.servers%"
             - "%gearman.default.settings%"
 
     gearman.cache.wrapper:
         class: "%gearman.cache.wrapper.class%"
+        public: true
         arguments:
             - "@gearman.parser"
             - "@doctrine_cache.providers.gearman_cache"
@@ -27,24 +30,28 @@ services:
 
     gearman.describer:
         class: "%gearman.describer.class%"
+        public: true
         arguments:
             - "@kernel"
 
     gearman.abstract.service:
-        abstract:  true
+        abstract: true
+        public: true
         arguments:
             - "@gearman.cache.wrapper"
             - "%gearman.default.settings%"
 
     gearman.execute:
         class: "%gearman.execute.class%"
+        public: true
         parent: gearman.abstract.service
         calls:
             - [setContainer,  ["@service_container"]]
             - [setEventDispatcher, ["@event_dispatcher"]]
 
     gearman:
         class: "%gearman.client.class%"
+        public: true
         parent: gearman.abstract.service
         calls:
             - [initTaskStructure, []]

Resources/docs/configuration.rst

@@ -41,6 +41,11 @@ config gearman cache, using doctrine cache.
                 - DependencyInjection
                 - Resources
 
+       # Resources - list of directories (relative to kernel root dir) which will be searched for workers
+       # This is useful if you don't have an "AppBundle"
+       resources:
+          Dir/With/Workers
+
        # default values
        # All these values will be used if are not overwritten in Workers or jobs
        defaults:

Service/GearmanParser.php

@@ -68,6 +68,13 @@ class GearmanParser
      */
     private $bundles;
 
+    /**
+     * @var array
+     *
+     * Namespaces paths to be searched
+     */
+    private $resources;
+
     /**
      * @var array
      *
@@ -82,13 +89,21 @@ class GearmanParser
      */
     private $defaultSettings;
 
+    /**
+     * Root kernel directory
+     *
+     * @var string
+     */
+    private $rootDir;
+
     /**
      * Construct method
      *
      * @param KernelInterface $kernel          Kernel instance
      * @param Reader          $reader          Reader
      * @param Finder          $finder          Finder
-     * @param array           $bundles         Bundle array where to parse workers, defined on condiguration
+     * @param array           $bundles         Bundle array where to parse workers, defined in configuration
+     * @param array           $resources       Array of namespace paths to be searched for worker annotations
      * @param array           $servers         Server list defined on configuration
      * @param array           $defaultSettings Default settings defined on configuration
      */
@@ -97,6 +112,7 @@ public function __construct(
         Reader $reader,
         Finder $finder,
         array $bundles,
+        array $resources,
         array $servers,
         array $defaultSettings
     )
@@ -106,8 +122,10 @@ public function __construct(
         $this->reader = $reader;
         $this->finder = $finder;
         $this->bundles = $bundles;
+        $this->resources = $resources;
         $this->servers = $servers;
         $this->defaultSettings = $defaultSettings;
+        $this->rootDir = $this->kernel->getRootDir();
     }
 
     /**
@@ -117,7 +135,8 @@ public function __construct(
      */
     public function load()
     {
-        list($paths, $excludedPaths) = $this->loadNamespaceMap($this->kernelBundles, $this->bundles);
+        list($paths, $excludedPaths) = $this->loadBundleNamespaceMap($this->kernelBundles, $this->bundles);
+        $paths = array_merge($paths, $this->loadResourceNamespaceMap($this->rootDir, $this->resources));
 
         return $this->parseNamespaceMap($this->finder, $this->reader, $paths, $excludedPaths);
     }
@@ -132,7 +151,7 @@ public function load()
      *
      * @return array Return an array containing paths and ignore paths
      */
-    public function loadNamespaceMap(array $kernelBundles, array $bundles)
+    public function loadBundleNamespaceMap(array $kernelBundles, array $bundles)
     {
         $paths = array();
         $excludedPaths = array();
@@ -177,6 +196,19 @@ public function loadNamespaceMap(array $kernelBundles, array $bundles)
         );
     }
 
+    /**
+     * Get resource paths
+     * @param string $rootDir
+     * @param array $resources
+     * @return array
+     */
+    public function loadResourceNamespaceMap($rootDir, array $resources)
+    {
+        return array_map(function($resource) use ($rootDir) {
+            return $rootDir . '/' . trim($resource, '/') . '/';
+        }, $resources);
+    }
+
     /**
      * Perform a parsing inside all namespace map
      *

Tests/Functional/AppKernel.php

@@ -11,9 +11,15 @@
  * @author Marc Morera <[email protected]>
  */
 
+namespace Mmoreram\GearmanBundle\Tests\Functional;
+
+use Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle;
+use Mmoreram\GearmanBundle\GearmanBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
 
+
 /**
  * AppKernel for testing
  */
@@ -25,9 +31,9 @@ class AppKernel extends Kernel
     public function registerBundles()
     {
         return array(
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),
-            new Mmoreram\GearmanBundle\GearmanBundle(),
+            new FrameworkBundle(),
+            new DoctrineCacheBundle(),
+            new GearmanBundle(),
         );
     }