Service refactoring

config/services.yaml

@@ -1,44 +1,3 @@
-parameters:
-    mailer_transport: sendmail
-    mailer_host: 127.0.0.1
-    mailer_user: null
-    mailer_password: null
-    mailer_port: null
-    locale: de
-    secret: '%env(APP_SECRET)%'
-    kernel.secret: '%env(APP_SECRET)%'
-    database_driver: pdo_mysql
-    database_host: 127.0.0.1
-    database_port: null
-    database_name: '%env(DATABASE_NAME)%'
-    database_user: '%env(DATABASE_USER)%'
-    database_password: '%env(DATABASE_PASSWORD)%'
-    track.gap_width: 10
-    strava.client_id: '%env(STRAVA_CLIENT_ID)%'
-    strava.token: '%env(STRAVA_TOKEN)%'
-    strava.secret: '%env(STRAVA_SECRET)%'
-    facebook.app_id: '%env(FACEBOOK_APP_ID)%'
-    facebook.app_secret: '%env(FACEBOOK_APP_SECRET)%'
-    facebook.default_token: '%env(FACEBOOK_DEFAULT_TOKEN)%'
-    runkeeper.client_id: '%env(RUNKEEPER_CLIENT_ID)%'
-    runkeeper.secret: '%env(RUNKEEPER_SECRET)%'
-    twitter.client_id: '%env(TWITTER_CLIENT_ID)%'
-    twitter.token: '%env(TWITTER_TOKEN)%'
-    twitter.secret: '%env(TWITTER_SECRET)%'
-    photo_tsv.access_key: '%env(PHOTO_TSV_ACCESS_KEY)%'
-    timeline.ttl: 60
-    notification.mail.sender_address: [email protected]
-    request_listener.http_port: 80
-    request_listener.https_port: 443
-    upload_destination.track: '%kernel.project_dir%/public/tracks'
-    upload_destination.photo: '%kernel.project_dir%/public/photos'
-    upload_destination.city_photo: '%kernel.project_dir%/public/cities'
-    upload_destination.ride_photo: '%kernel.project_dir%/public/rides'
-    upload_destination.frontpage_teaser: '%kernel.project_dir%/public/teaser'
-    upload_destination.user_photo: '%kernel.project_dir%/public/users'
-    staticmaps.host: '%env(STATICMAPS_HOST)%'
-    assets_version: '%env(ASSETS_VERSION)%'
-
 services:
     _defaults:
         autowire: true
@@ -80,42 +39,6 @@ services:
     Sonata\SeoBundle\Seo\SeoPageInterface:
         alias: sonata.seo.page.default
 
-    App\Criticalmass\Image\ExifWrapper\ExifWrapper:
-        arguments:
-            $flysystemFilesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
-
-    App\Criticalmass\Image\PhotoManipulator\Storage\PhotoStorage:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
-
-    App\Criticalmass\Image\PhotoUploader\PhotoUploader:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
-
-    App\Criticalmass\Geo\GpxReader\GpxReader:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
-
-    App\Criticalmass\Geo\GpxReader\TrackReader:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
-
-    App\Criticalmass\Geo\GpxWriter\GpxWriter:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
-
-    App\Criticalmass\ProfilePhotoGenerator\ProfilePhotoGenerator:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_user_photo_filesystem'
-
-    App\Criticalmass\UploadableDataHandler\UploadableDataHandler:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
-
-    App\Criticalmass\UploadValidator\TrackValidator:
-        arguments:
-            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
-
     App\Criticalmass\Geocoding\ReverseGeocoderInterface:
         alias: App\Criticalmass\Geocoding\CachedReverseGeocoder
 
@@ -129,62 +52,6 @@ services:
     App\Criticalmass\Geo\Loop\LoopInterface:
         alias: App\Criticalmass\Geo\Loop\TrackLoop
 
-    App\Request\ParamConverter\RideParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: ride_converter }
-
-    App\Request\ParamConverter\RegionParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: region_converter }
-
-    App\Request\ParamConverter\CityParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: city_converter }
-
-    App\Request\ParamConverter\CityCycleParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: citycycle_converter }
-
-    App\Request\ParamConverter\LocationParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: location_converter }
-
-    App\Request\ParamConverter\BoardParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: board_converter }
-
-    App\Request\ParamConverter\ThreadParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: thread_converter }
-
-    App\Request\ParamConverter\ParticipationParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: participation_converter }
-
-    App\Request\ParamConverter\PhotoParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: photo_converter }
-
-    App\Request\ParamConverter\PromotionParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: promotion_converter }
-
-    App\Request\ParamConverter\UserParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 10, converter: user_converter }
-
-    App\Request\ParamConverter\SocialNetworkProfileParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: socialnetworkprofile_converter }
-
-    App\Request\ParamConverter\SocialNetworkFeedItemParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: socialnetworkfeeditem_converter }
-
-    App\Request\ParamConverter\TrackParamConverter:
-        tags:
-            - { name: request.param_converter, priority: 0, converter: track_converter }
-
     App\Criticalmass\Imagine\DataLoader\RemoteStreamLoader:
         arguments: ['@liip_imagine']
         tags:
@@ -244,3 +111,39 @@ services:
         arguments:
             $cityFinder: '@fos_elastica.finder.criticalmass_city'
             $rideFinder: '@fos_elastica.finder.criticalmass_ride'
+
+    App\Criticalmass\Image\ExifWrapper\ExifWrapper:
+        arguments:
+            $flysystemFilesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+    App\Criticalmass\Image\PhotoManipulator\Storage\PhotoStorage:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+    App\Criticalmass\Image\PhotoUploader\PhotoUploader:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+    App\Criticalmass\Geo\GpxReader\GpxReader:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
+
+    App\Criticalmass\Geo\GpxReader\TrackReader:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
+
+    App\Criticalmass\Geo\GpxWriter\GpxWriter:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
+
+    App\Criticalmass\ProfilePhotoGenerator\ProfilePhotoGenerator:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_user_photo_filesystem'
+
+    App\Criticalmass\UploadableDataHandler\UploadableDataHandler:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+    App\Criticalmass\UploadValidator\TrackValidator:
+        arguments:
+            $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'

config/services/1_parameters.yaml

@@ -0,0 +1,40 @@
+parameters:
+  mailer_transport: sendmail
+  mailer_host: 127.0.0.1
+  mailer_user: null
+  mailer_password: null
+  mailer_port: null
+  locale: de
+  secret: '%env(APP_SECRET)%'
+  kernel.secret: '%env(APP_SECRET)%'
+  database_driver: pdo_mysql
+  database_host: 127.0.0.1
+  database_port: null
+  database_name: '%env(DATABASE_NAME)%'
+  database_user: '%env(DATABASE_USER)%'
+  database_password: '%env(DATABASE_PASSWORD)%'
+  track.gap_width: 10
+  strava.client_id: '%env(STRAVA_CLIENT_ID)%'
+  strava.token: '%env(STRAVA_TOKEN)%'
+  strava.secret: '%env(STRAVA_SECRET)%'
+  facebook.app_id: '%env(FACEBOOK_APP_ID)%'
+  facebook.app_secret: '%env(FACEBOOK_APP_SECRET)%'
+  facebook.default_token: '%env(FACEBOOK_DEFAULT_TOKEN)%'
+  runkeeper.client_id: '%env(RUNKEEPER_CLIENT_ID)%'
+  runkeeper.secret: '%env(RUNKEEPER_SECRET)%'
+  twitter.client_id: '%env(TWITTER_CLIENT_ID)%'
+  twitter.token: '%env(TWITTER_TOKEN)%'
+  twitter.secret: '%env(TWITTER_SECRET)%'
+  photo_tsv.access_key: '%env(PHOTO_TSV_ACCESS_KEY)%'
+  timeline.ttl: 60
+  notification.mail.sender_address: [email protected]
+  request_listener.http_port: 80
+  request_listener.https_port: 443
+  upload_destination.track: '%kernel.project_dir%/public/tracks'
+  upload_destination.photo: '%kernel.project_dir%/public/photos'
+  upload_destination.city_photo: '%kernel.project_dir%/public/cities'
+  upload_destination.ride_photo: '%kernel.project_dir%/public/rides'
+  upload_destination.frontpage_teaser: '%kernel.project_dir%/public/teaser'
+  upload_destination.user_photo: '%kernel.project_dir%/public/users'
+  staticmaps.host: '%env(STATICMAPS_HOST)%'
+  assets_version: '%env(ASSETS_VERSION)%'

config/services/flysystem.yaml

@@ -0,0 +1,36 @@
+services:
+  App\Criticalmass\Image\ExifWrapper\ExifWrapper:
+    arguments:
+      $flysystemFilesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+  App\Criticalmass\Image\PhotoManipulator\Storage\PhotoStorage:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+  App\Criticalmass\Image\PhotoUploader\PhotoUploader:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+  App\Criticalmass\Geo\GpxReader\GpxReader:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
+
+  App\Criticalmass\Geo\GpxReader\TrackReader:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
+
+  App\Criticalmass\Geo\GpxWriter\GpxWriter:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'
+
+  App\Criticalmass\ProfilePhotoGenerator\ProfilePhotoGenerator:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_user_photo_filesystem'
+
+  App\Criticalmass\UploadableDataHandler\UploadableDataHandler:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_photo_photo_filesystem'
+
+  App\Criticalmass\UploadValidator\TrackValidator:
+    arguments:
+      $filesystem: '@oneup_flysystem.flysystem_track_track_filesystem'

config/services/param_converter.yaml

@@ -0,0 +1,56 @@
+services:
+  App\Request\ParamConverter\RideParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: ride_converter }
+
+  App\Request\ParamConverter\RegionParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: region_converter }
+
+  App\Request\ParamConverter\CityParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: city_converter }
+
+  App\Request\ParamConverter\CityCycleParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: citycycle_converter }
+
+  App\Request\ParamConverter\LocationParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: location_converter }
+
+  App\Request\ParamConverter\BoardParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: board_converter }
+
+  App\Request\ParamConverter\ThreadParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: thread_converter }
+
+  App\Request\ParamConverter\ParticipationParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: participation_converter }
+
+  App\Request\ParamConverter\PhotoParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: photo_converter }
+
+  App\Request\ParamConverter\PromotionParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: promotion_converter }
+
+  App\Request\ParamConverter\UserParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 10, converter: user_converter }
+
+  App\Request\ParamConverter\SocialNetworkProfileParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: socialnetworkprofile_converter }
+
+  App\Request\ParamConverter\SocialNetworkFeedItemParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: socialnetworkfeeditem_converter }
+
+  App\Request\ParamConverter\TrackParamConverter:
+    tags:
+      - { name: request.param_converter, priority: 0, converter: track_converter }