Merge pull request #194 from getsentry/prefer-dist-hardening

Prefer lowest hardening

Author: Jean85

.travis.yml

@@ -26,9 +26,9 @@ jobs:
   include:
     - stage: Test
       php: 7.1
-      env:
-        - DEPS=--prefer-lowest
+      name: prefer-lowest
       install:
+        - composer remove --dev friendsofphp/php-cs-fixer phpstan/phpstan --no-update
         - travis_retry travis_wait composer install --no-interaction --prefer-dist
         - travis_retry travis_wait composer update --no-interaction --prefer-dist --prefer-stable --prefer-lowest
     - stage: Code style and static analysis

composer.json

@@ -23,7 +23,7 @@
         "jean85/pretty-package-versions": "^1.0",
         "sentry/sdk": "^2.0",
         "symfony/config": "^3.0||^4.0",
-        "symfony/console": "^3.3||^4.0",
+        "symfony/console": "^3.0||^4.0",
         "symfony/dependency-injection": "^3.0||^4.0",
         "symfony/event-dispatcher": "^3.0||^4.0",
         "symfony/http-kernel": "^3.0||^4.0",

src/DependencyInjection/Configuration.php

@@ -65,11 +65,11 @@ public function getConfigTreeBuilder()
                     '%kernel.cache_dir%',
                     $this->getProjectRoot() . '/vendor',
                 ])
-                ->scalarPrototype()->end()
+                ->prototype('scalar')->end()
             ->end()
             ->arrayNode('excluded_exceptions')
                 ->defaultValue($defaultValues->getExcludedExceptions())
-                ->scalarPrototype()->end()
+                ->prototype('scalar')->end()
             ->end()
             ->scalarNode('http_proxy')
             ->end()
@@ -81,7 +81,7 @@ public function getConfigTreeBuilder()
             ->end()
             ->arrayNode('prefixes')
                 ->defaultValue($defaultValues->getPrefixes())
-                ->scalarPrototype()->end()
+                ->prototype('scalar')->end()
             ->end()
             ->scalarNode('project_root')
                 ->defaultValue($this->getProjectRoot())
@@ -100,7 +100,7 @@ public function getConfigTreeBuilder()
             ->end()
             ->arrayNode('tags')
                 ->normalizeKeys(false)
-                ->scalarPrototype()
+                ->prototype('scalar')
             ->end()
         ;
 

src/Resources/config/services.xml

@@ -22,15 +22,15 @@
             </call>
         </service>
 
-        <service id="Sentry\SentryBundle\EventListener\ConsoleListener" public="false">
+        <service id="Sentry\SentryBundle\EventListener\ConsoleListener" class="Sentry\SentryBundle\EventListener\ConsoleListener" public="false">
             <argument type="service" id="Sentry\State\HubInterface" />
             <argument type="service" id="security.token_storage" on-invalid="ignore" />
             <argument type="service" id="security.authorization_checker" on-invalid="ignore" />
 
             <tag name="kernel.event_listener" event="console.command" method="onConsoleCommand" priority="%sentry.listener_priorities.console%" />
         </service>
 
-        <service id="Sentry\SentryBundle\EventListener\RequestListener" public="false">
+        <service id="Sentry\SentryBundle\EventListener\RequestListener" class="Sentry\SentryBundle\EventListener\RequestListener" public="false">
             <argument type="service" id="Sentry\State\HubInterface" />
             <argument type="service" id="security.token_storage" on-invalid="ignore" />
             <argument type="service" id="security.authorization_checker" on-invalid="ignore" />