Update services config

Author: PastisD

src/Resources/config/services.yml

@@ -1,41 +1,31 @@
-parameters:
-    php_fast_cache.phpfastcache.class: Phpfastcache\Bundle\Service\Phpfastcache
-    php_fast_cache.human_readable.class: Phpfastcache\Bundle\Twig\HumanReadableExtension\Extension
-    php_fast_cache.twig_cache.class: Phpfastcache\Bundle\Twig\CacheExtension\Extension
-    php_fast_cache.twig_cache_stategy.class: Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy\LifetimeCacheStrategy
-    php_fast_cache.twig_cache_provider.class: Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider\PsrCacheAdapter
-
 services:
     Phpfastcache\Bundle\Service\Phpfastcache:
         autowire: true
         public: false
         arguments:
-            - "%phpfastcache%"
-            - "@?debug.stopwatch"
+            - '%phpfastcache%'
+            - '@?debug.stopwatch'
     Phpfastcache\Bundle\Command\PhpfastcacheCommand:
         arguments: ['@Phpfastcache\Bundle\Service\Phpfastcache', '%phpfastcache%']
         tags:
             - { name: console.command }
-    phpfastcache.human_readable_size:
-        class: "%php_fast_cache.human_readable.class%"
+    Phpfastcache\Bundle\Twig\HumanReadableExtension\Extension:
         tags:
             - { name: twig.extension }
     phpfastcache.twig_cache_driver_provider:
-        class: "%php_fast_cache.phpfastcache.class%"
+        class: 'Phpfastcache\Bundle\Service\Phpfastcache'
         factory: 'Phpfastcache\Bundle\Service\Phpfastcache:getTwigCacheInstance'
-    phpfastcache.twig_cache_provider:
-        class: "%php_fast_cache.twig_cache_provider.class%"
+    Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider\PsrCacheAdapter:
         arguments:
-             - "@phpfastcache.twig_cache_driver_provider"
-    phpfastcache.twig_cache_stategy:
-        class: "%php_fast_cache.twig_cache_stategy.class%"
+             - '@phpfastcache.twig_cache_driver_provider'
+    Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy\LifetimeCacheStrategy:
+        public: false
         arguments:
-            - "@phpfastcache.twig_cache_provider"
-            - "@?phpfastcache.request_collector"
-            - "%phpfastcache%"
-    twig.extension.cache:
-        class: "%php_fast_cache.twig_cache.class%"
+            - '@Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider\PsrCacheAdapter'
+            - '@?Phpfastcache\Bundle\DataCollector\CacheCollector'
+            - '%phpfastcache%'
+    Phpfastcache\Bundle\Twig\CacheExtension\Extension:
         arguments:
-          - "@phpfastcache.twig_cache_stategy"
+          - '@Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy\LifetimeCacheStrategy'
         tags:
          - { name: twig.extension }

src/Resources/config/services_dev.yml

@@ -1,9 +1,5 @@
-parameters:
-    php_fast_cache.data_collector.class: Phpfastcache\Bundle\DataCollector\CacheCollector
-
 services:
-    data_collector.phpfastcache:
-        class: "%php_fast_cache.data_collector.class%"
+    Phpfastcache\Bundle\DataCollector\CacheCollector:
         arguments:
             - '@Phpfastcache\Bundle\Service\Phpfastcache'
         public: false
@@ -12,4 +8,4 @@ services:
                 name:     data_collector
                 template: "@Phpfastcache/Collector/cache.html.twig"
                 id:       'phpfastcache'
-                priority: 300
+                priority: 300