Skip to content

Upgrade doctrine/annotations to 2.0 and refactor code to fit it #207

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
merged 2 commits into from
Mar 31, 2025
Merged

Upgrade doctrine/annotations to 2.0 and refactor code to fit it #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f2d7be
Upgrade doctrine/annotations to 2.0 and refactor code to fit it
ApetroaeiClaudiu Mar 31, 2025
ef97b78
Updated composer.json dependency
ApetroaeiClaudiu Mar 31, 2025
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
15 changes: 4 additions & 11 deletions GearmanBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace Mmoreram\GearmanBundle;

use Doctrine\Common\Annotations\AnnotationRegistry;
use Mmoreram\GearmanBundle\Driver\Gearman\Work;
use Mmoreram\GearmanBundle\Driver\Gearman\Job;
use Symfony\Component\HttpKernel\Bundle\Bundle;

class GearmanBundle extends Bundle
Expand All @@ -12,16 +14,7 @@ class GearmanBundle extends Bundle
*/
public function boot()
{
$kernel = $this->container->get('kernel');

AnnotationRegistry::registerFile(
$kernel
->locateResource("@GearmanBundle/Driver/Gearman/Work.php")
);

AnnotationRegistry::registerFile(
$kernel
->locateResource("@GearmanBundle/Driver/Gearman/Job.php")
);
AnnotationRegistry::loadAnnotationClass(Work::class);
AnnotationRegistry::loadAnnotationClass(Job::class);
}
}
6 changes: 3 additions & 3 deletions Tests/Module/WorkerClassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace Mmoreram\GearmanBundle\Tests\Module;

use Doctrine\Common\Annotations\SimpleAnnotationReader;
use Doctrine\Common\Annotations\AnnotationReader;

use Mmoreram\GearmanBundle\Driver\Gearman\Work as WorkAnnotation;
use Mmoreram\GearmanBundle\Module\WorkerClass;
Expand All @@ -38,7 +38,7 @@ class WorkerClassTest extends \PHPUnit\Framework\TestCase
private $reflectionClass;

/**
* @var SimpleAnnotationReader
* @var AnnotationReader
*
* Reader
*/
Expand Down Expand Up @@ -115,7 +115,7 @@ public function setUp(): void
->getMock();

$this->reader = $this
->getMockBuilder('Doctrine\Common\Annotations\SimpleAnnotationReader')
->getMockBuilder('Doctrine\Common\Annotations\AnnotationReader')
->disableOriginalConstructor()
->setMethods([
'getMethodAnnotations',
Expand Down
2 changes: 1 addition & 1 deletion Tests/Service/GearmanParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public function testParseNamespaceMapSomePaths()
$excludedPaths = [];

$reader = $this
->getMockBuilder('\Doctrine\Common\Annotations\SimpleAnnotationReader')
->getMockBuilder('\Doctrine\Common\Annotations\AnnotationReader')
->setMethods(null)
->getMock();

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"require": {
"php": "^7.4 || ^8.0",
"ext-gearman": "*",
"doctrine/annotations": "^1.5",
"doctrine/annotations": "^1.5 || ^2.0",
"symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0",
"symfony/yaml": "^4.4 || ^5.0 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
Expand Down
Loading