Codecleanupandcacheing #38

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.

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

Open

curenect-meiner wants to merge 48 commits into abdellahrk:main from curenect-meiner:codecleanupandcacheing

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,8 @@ @@
     /composer.lock
     /.env.test
     /.phpunit.result.cache
+    .php-cs-fixer.dist.php
+    rector.php
+    Makefile
+    phpstan-dev.neon
+    .ddev

composer.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,26 +11,26 @@
  
        ],

        "require": {

            "php": "^8.2",

            "symfony/dependency-injection": "^6.0 || ^7.0 || ^8.0",

            "symfony/config": "^6.0 || ^7.0 || ^8.0" ,

            "symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0",

            "symfony/config": "^6.4 || ^7.0 || ^8.0" ,

            "twig/twig": "^2.0 || ^3.0",

            "symfony/cache": "^6.0 || ^7.0 || ^8.0",

            "symfony/http-kernel": "^6.0 | ^7.0 || ^8.0",

            "symfony/routing": "^6.0 || ^7.0 || ^8.0",

            "symfony/cache": "^6.4 || ^7.0 || ^8.0",

            "symfony/http-kernel": "^6.4 | ^7.0 || ^8.0",

            "symfony/routing": "^6.4 || ^7.0 || ^8.0",

            "doctrine/persistence": "^3.4 || ^4.0",

            "symfony/messenger": "^6.0 || ^7.0 || ^8.0",

            "symfony/messenger": "^6.4 || ^7.0 || ^8.0",

            "ext-dom": "*",

            "symfony/console": "^6.0 || ^7.0 || ^8.0",

            "symfony/event-dispatcher": "^6.0 || ^7.0 || ^8.0"

            "symfony/console": "^6.4 || ^7.0 || ^8.0",

            "symfony/event-dispatcher": "^6.4 || ^7.0 || ^8.0"

        },

        "require-dev": {

            "phpstan/phpstan": "^2.1",

            "phpunit/phpunit": "^11 || ^12.1",

            "symfony/test-pack": "^1.0",

            "symfony/framework-bundle": "^6.0 || ^7.0 || ^8.0",

            "symfony/yaml": "^6.0 || ^7.0 || ^8.0",

            "symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0",

            "symfony/yaml": "^6.4 || ^7.0 || ^8.0",

            "symfony/profiler-pack": "^1.0",

            "symfony/serializer": "^6.0 || ^7.0 || ^8.0"

            "symfony/serializer": "^6.4 || ^7.0 || ^8.0"

        },

        "license": "MIT",

        "autoload": {

config/definition.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,11 @@ @@
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->booleanNode('enabled')->defaultFalse()->end()
+                                ->integerNode('cache_ttl')
+                                    ->info('Cache TTL in seconds')
+                                    ->defaultValue(604800)
+                                    ->min(0)
+                                ->end()
                             ->end()
                         ->end()
                         ->arrayNode('meta_tags')
@@ Expand Down @@

config/services.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -66,8 +66,7 @@ @@
         $services->set('seo.meta.tags', MetaTagsManager::class)->tag('kernel.reset', ['method' => 'reset']);
         $services->alias(MetaTagsManagerInterface::class, 'seo.meta.tags');
         $services->set(MetaTagsExtension::class, MetaTagsExtension::class)
-            ->autowire()
-            ->tag('twig.extension');
+            ->autowire();
         $services->set('seo.sitemap', Sitemap::class);
         $services->alias(SitemapInterface::class, 'seo.sitemap')->public();
@@ Expand All / @@ -76,8 +75,7 @@ @@
         $services->set('open.graph.bundle', OpenGraphManager::class);
         $services->alias(OpenGraphManagerInterface::class, 'open.graph.bundle')->public();
-        $services->set('open.graph.bundle.twig.extension', OpenGraphExtension::class)
-            ->tag('twig.extension');
+        $services->set('open.graph.bundle.twig.extension', OpenGraphExtension::class);
         $services->set('open.graph', OpenGraphManager::class)->tag('kernel.reset', ['method' => 'reset']);
@@ Expand Down Expand Up / @@ -144,6 +142,5 @@ @@
             ->alias(BreadcrumbManagerInterface::class, 'seo.breadcrumb')->public();
         $services
             ->set(BreadcrumbExtension::class, BreadcrumbExtension::class)
-            ->autowire()
-            ->tag('twig.extension');
+            ->autowire();
     };

src/Breadcrumb/BreadcrumbManager.php

-Original file line number
+Diff line change
@@ -1,4 +1,7 @@
     <?php
+    declare(strict_types=1);
     /*
      * Copyright (c) 2025.
      *
@@ Expand All / @@ -15,6 +18,10 @@ @@
     class BreadcrumbManager implements BreadcrumbManagerInterface, ResettableInterface
     {
+        /**
+         * @param array<int, array{label: string, url: string|null}> $items
+         * @param array<string, string>                              $options
+         */
         public function __construct(
             public array $items = [],
             public array $options = [],
@@ Expand All / @@ -24,7 +31,6 @@ public function __construct( @@
             $this->options['active_item'] = 'active';
         }
         public function addItem(string $label, ?string $url = null): static
         {
             $this->items[] = [
@@ Expand All @@
             return $this;
         }
-        /**
-         * @inheritDoc
-         */
         public function reset(): void
         {
             $this->items = [];
         }
+        /**
+         * @return array<int, array{label: string, url: string|null}>
+         */
         public function getItems(): array
         {
-           return $this->items;
+            return $this->items;
         }
+        /**
+         * @return array<string, string>
+         */
         public function getOptions(): array
         {
             return $this->options;
         }
+        /**
+         * @param array<string, string> $options
+         */
         public function setOptions(array $options): static
         {
             $this->options = $options;
             return $this;
         }
-    }
+    }

src/Breadcrumb/BreadcrumbManagerInterface.php

-Original file line number
+Diff line change
@@ -1,4 +1,7 @@
     <?php
+    declare(strict_types=1);
     /*
      * Copyright (c) 2025.
      *
@@ Expand All / @@ -15,9 +18,18 @@ interface BreadcrumbManagerInterface @@
     {
         public function addItem(string $label, ?string $url = null): static;
+        /**
+         * @return array<int, array{label: string, url: string|null}>
+         */
         public function getItems(): array;
+        /**
+         * @return array<string, string>
+         */
         public function getOptions(): array;
+        /**
+         * @param array<string, string> $options
+         */
         public function setOptions(array $options): static;
-    }
+    }

src/Command/GenerateSitemapCommand.php

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /*
      * Copyright (c) 2025.
      *
@@ Expand All / @@ -13,14 +14,11 @@ @@
     namespace Rami\SeoBundle\Command;
-    use Psr\Log\LoggerInterface;
     use Rami\SeoBundle\Sitemap\Message\GenerateSitemapMessage;
-    use Rami\SeoBundle\Sitemap\SitemapInterface;
-    use Symfony\Component\Console\Command\Command;
-    use Symfony\Component\Console\Input\InputArgument;
-    use Symfony\Component\Console\Input\InputInterface;
-    use Symfony\Component\Console\Output\OutputInterface;
+    use Symfony\Component\Console\Attribute\Argument;
     use Symfony\Component\Console\Attribute\AsCommand;
+    use Symfony\Component\Console\Command\Command;
+    use Symfony\Component\Console\Style\SymfonyStyle;
     use Symfony\Component\Messenger\MessageBusInterface;
     #[AsCommand(
@@ Expand All / @@ -29,23 +27,21 @@ @@
         aliases: ['seo:sitemap:generate'],
         hidden: false,
     )]
-    class GenerateSitemapCommand extends Command
+    readonly class GenerateSitemapCommand
     {
         public function __construct(
             private MessageBusInterface $messageBus
         ) {
-            parent::__construct();
         }
-        protected function configure(): void
-        {
-            $this->addArgument('baseUrl', InputArgument::REQUIRED, 'The base url to generate sitemap');
-        }
+        public function __invoke(
+            #[Argument(description: 'The base url to generate sitemap', name: 'Base Url')]
+            string $baseUrl,
+            SymfonyStyle $symfonyStyle
+        ): int {
+            $this->messageBus->dispatch(new GenerateSitemapMessage($baseUrl));
+            $symfonyStyle->success('Generating Sitemap');
-        protected function execute(InputInterface $input, OutputInterface $output): int
-        {
-            $this->messageBus->dispatch(new GenerateSitemapMessage($input->getArgument('baseUrl')));
-            $output->writeln("<info>Generating Sitemap</info>");
             return Command::SUCCESS;
         }
     }

src/DataCollector/SeoCollector.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,7 @@
  
    <?php

    declare(strict_types=1);

    /*

     * Copyright (c) 2025.

     *

    @@ -17,13 +20,17 @@
  
    use Symfony\Component\HttpFoundation\Request;

    use Symfony\Component\HttpFoundation\Response;

    use Symfony\Component\Serializer\Normalizer\NormalizerInterface;

    use Throwable;

    use function assert;

    use function is_array;

    class SeoCollector extends AbstractDataCollector

    {

        public function __construct(

            private MetaTagsManagerInterface $metaTagsManager,

            private NormalizerInterface $normalizer,

            private OpenGraphManagerInterface $openGraphManager,

            private readonly MetaTagsManagerInterface $metaTagsManager,

            private readonly NormalizerInterface $normalizer,

            private readonly OpenGraphManagerInterface $openGraphManager,

        ) {

        }

    @@ -32,7 +39,7 @@ public static function getTemplate(): ?string
  
            return 'templates/seo/data_collector.html.twig';

        }

        public function collect(Request $request, Response $response, ?\Throwable $exception = null): void

        public function collect(Request $request, Response $response, ?Throwable $exception = null): void

        {

            $this->data['seo_metas'] = $this->normalizer->normalize(

                $this->metaTagsManager->getSeoMeta(),

    @@ -53,22 +60,36 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
  
            );

        }

        /** @return [] */

        /**

         * @return array<string, mixed>

         */

        public function getSeoMetas(): array

        {

            return $this->data['seo_metas'];

            $data = $this->data['seo_metas'] ?? [];

            assert(is_array($data));

            /** @var array<string, mixed> $returnData */

            $returnData = $data;

            return $returnData;

        }

        /** @return [] */

        /**

         * @return array<string, mixed>

         */

        public function getOpenGraph(): array

        {

            return $this->data['open_graph'];

        }

            $data = $this->data['open_graph'] ?? [];

            assert(is_array($data));

            /** @var array<string, mixed> $returnData */

            $returnData = $data;

            return $returnData;

        }

        public function reset(): void

        {

            $this->data = [];

        }

    }
      
    }

src/DependencyInjection/CompilerPasses/GoogleTagCompilerPass.php

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /*
      * Copyright (c) 2025.
      *
@@ Expand All / @@ -13,8 +14,11 @@ @@
     namespace Rami\SeoBundle\DependencyInjection\CompilerPasses;
-    use Symfony\Component\DependencyInjection\ContainerBuilder;
     use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+    use Symfony\Component\DependencyInjection\ContainerBuilder;
+    use function assert;
+    use function is_array;
     class GoogleTagCompilerPass implements CompilerPassInterface
     {
@@ Expand All / @@ -30,9 +34,12 @@ public function process(ContainerBuilder $container): void @@
                 return;
             }
-            foreach ($container->findTaggedServiceIds('seo.google_tag_manager') as $id => $tags) {
-                $definition->addMethodCall('enableGoogleTagManager',[
-                    $container->getParameter('seo.google_tag_manager')['tag_manager_id'],
+            foreach ($container->findTaggedServiceIds('seo.google_tag_manager') as $tags) {
+                $config = $container->getParameter('seo.google_tag_manager');
+                assert(is_array($config));
+                $definition->addMethodCall('enableGoogleTagManager', [
+                    $config['tag_manager_id'],
                 ]);
             }
         }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Codecleanupandcacheing #38

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Codecleanupandcacheing #38

Are you sure you want to change the base?

Uh oh!

Codecleanupandcacheing #38

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!