Mark conflicts (#95)

Mark conflicts and change constraints

Author: mglaman

.circleci/config.yml

@@ -104,13 +104,7 @@ jobs:
       - create-drupal-project:
           project: 'drupal/legacy-project:^8@alpha'
       - local-require
-# @todo use this when `require` constraints relaxed.
-#      - run:
-#          name: Add upgrade_status
-#          command: |
-#            cd /tmp/drupal
-#            composer require drupal/upgrade_status:1.x-dev
-# @todo use composer, not this hack.
+      # Composer constraints prevent requiring via compser, but this helps test drupalci's phpstan build step as well.
       - run:
           name: Add upgrade_status
           command: |

composer.json

@@ -11,20 +11,24 @@
     ],
     "require": {
         "php": "^7.1",
-        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan": "~0.11.0",
         "symfony/yaml": "~3.4.5|^4.2",
         "webflo/drupal-finder": "^1.2",
         "nette/di": "^3.0"
     },
     "require-dev": {
-        "phpstan/phpstan-strict-rules": "^0.11",
+        "phpstan/phpstan-strict-rules": "~0.11.0",
         "squizlabs/php_codesniffer": "^3.3",
         "phpunit/phpunit": "^7.5",
-        "phpstan/phpstan-deprecation-rules": "^0.11.0",
+        "phpstan/phpstan-deprecation-rules": "~0.11.0",
         "composer/installers": "^1.6",
         "drupal/core-recommended": "^8.8@alpha",
         "drush/drush": "^9.6"
     },
+    "conflict": {
+        "phpstan/phpstan": ">=0.12",
+        "phpstan/phpstan-deprecation-rules": ">=0.12"
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "suggest": {