Browse Source

Merge pull request #125 from mmoreram/feature/some-stuff-for-version-3

Some stuff for version3
Marc Morera 10 years ago
parent
commit
e5693ecb47

+ 13 - 1
.formatter.yml

@@ -4,4 +4,16 @@ use-sort:
         - Mmoreram
     group-type: each
     sort-type: alph
-    sort-direction: asc
+    sort-direction: asc
+
+header: |
+    /**
+     * Gearman Bundle for Symfony2
+     *
+     * For the full copyright and license information, please view the LICENSE
+     * file that was distributed with this source code.
+     *
+     * Feel free to edit as you please, and have fun.
+     *
+     * @author Marc Morera <yuhu@mmoreram.com>
+     */

+ 2 - 1
Command/Util/GearmanOutputAwareInterface.php

@@ -9,7 +9,6 @@
  * Feel free to edit as you please, and have fun.
  *
  * @author Marc Morera <yuhu@mmoreram.com>
- * @author Dominic Grostate <codekestrel@googlemail.com>
  */
 
 namespace Mmoreram\GearmanBundle\Command\Util;
@@ -19,6 +18,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * Interface GearmanOutputAwareInterface
  *
+ * @author Dominic Grostate <codekestrel@googlemail.com>
+ *
  * @since 2.4.2
  */
 interface GearmanOutputAwareInterface

+ 5 - 1
Dispatcher/Abstracts/AbstractGearmanDispatcher.php

@@ -3,8 +3,12 @@
 /**
  * Gearman Bundle for Symfony2
  *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
  * @author Marc Morera <yuhu@mmoreram.com>
- * @since  2013
  */
 
 namespace Mmoreram\GearmanBundle\Dispatcher\Abstracts;

+ 2 - 1
Event/GearmanWorkExecutedEvent.php

@@ -9,7 +9,6 @@
  * Feel free to edit as you please, and have fun.
  *
  * @author Marc Morera <yuhu@mmoreram.com>
- * @author Dominic Grostate <codekestrel@googlemail.com>
  */
 
 namespace Mmoreram\GearmanBundle\Event;
@@ -19,6 +18,8 @@ use Symfony\Component\EventDispatcher\Event;
 /**
  * GearmanWorkExecutedEvent
  *
+ * @author Dominic Grostate <codekestrel@googlemail.com>
+ *
  * @since 2.4.2
  */
 class GearmanWorkExecutedEvent extends Event

+ 5 - 1
Service/Abstracts/AbstractGearmanService.php

@@ -3,8 +3,12 @@
 /**
  * Gearman Bundle for Symfony2
  *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
  * @author Marc Morera <yuhu@mmoreram.com>
- * @since  2013
  */
 
 namespace Mmoreram\GearmanBundle\Service\Abstracts;

+ 19 - 0
UPGRADE-3.md

@@ -0,0 +1,19 @@
+# Upgrade from 2.* to 3.*
+
+This guide will help you upgrading from GearmanBundle 2.* to GearmanBundle 3.*
+
+## FrameworkBundle
+
+Version 3 of this bundle will require FramworkBundle ~2.4 because needs support
+for using Commands as a Service, introduced in
+[this Pull Request](https://github.com/symfony/symfony/pull/9199).
+
+## Dependencies
+
+All composer dependencies have changed to semantic model. It means that all
+Symfony and Doctrine packages were requiring `>=2.1` while now all packages are
+expected to use highest stable version until next major version: `~2.1`.
+
+PHPUnit and PHPFormatter are no longer dependencies, because they can be
+downloaded and used through their phar files. This reduces with some packages
+the development environment.

+ 11 - 13
composer.json

@@ -20,18 +20,16 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/framework-bundle": ">=2.2",
-        "doctrine/common": ">=2.2",
-        "symfony/console": ">=2.1",
-        "symfony/config": ">=2.1",
-        "symfony/http-kernel": ">=2.1",
-        "symfony/dependency-injection": ">=2.1",
-        "doctrine/doctrine-cache-bundle": "1.0.0",
-        "symfony/finder": ">=2.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": ">=3.7",
-        "mmoreram/php-formatter": "~1.0"
+
+        "doctrine/doctrine-cache-bundle": "~1.0",
+        "doctrine/common": "~2.2",
+
+        "symfony/dependency-injection": "~2.1",
+        "symfony/framework-bundle": "~2.4",
+        "symfony/http-kernel": "~2.1",
+        "symfony/console": "~2.1",
+        "symfony/config": "~2.1",
+        "symfony/finder": "~2.1"
     },
     "target-dir": "Mmoreram/GearmanBundle",
     "autoload": {
@@ -40,7 +38,7 @@
     "minimum-stability": "stable", 
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "4.0-dev"
         }
     }
 }