(fix) Resolve composer dependency hell to get necessary upgrades to packages - #665

.gitlab-ci.yml

@@ -31,7 +31,7 @@ lint:
  stage: test
  image: minds/php:7.3
  script:
- - PHP_CS_FIXER_IGNORE_ENV=true bin/php-cs-fixer fix --allow-risky=yes --verbose --dry-run
+ - bin/php-cs-fixer fix --allow-risky=yes --verbose --dry-run
 
 prepare:fpm:
  stage: prepare

Spec/Core/Blogs/Delegates/FeedsSpec.php

@@ -103,7 +103,7 @@ class FeedsSpec extends ObjectBehavior
 
  //
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Boost/RepositorySpec.php

@@ -398,7 +398,7 @@ class RepositorySpec extends ObjectBehavior
 
  //
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Channels/Snapshots/RepositorySpec.php

@@ -145,7 +145,7 @@ class RepositorySpec extends ObjectBehavior
  ->shouldReturn(true);
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Comments/RepositorySpec.php

@@ -414,7 +414,7 @@ class RepositorySpec extends ObjectBehavior
  ->shouldReturn(true);
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Data/Cassandra/ScrollSpec.php

@@ -69,7 +69,7 @@ class ScrollSpec extends ObjectBehavior
  ->shouldBeAGenerator([1, 2, 3, 4, 5]);
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Feeds/Top/ManagerSpec.php

@@ -217,7 +217,7 @@ class ManagerSpec extends ObjectBehavior
  ->shouldBe('urn:activity:5001');
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Groups/FeedsSpec.php

@@ -476,7 +476,7 @@ class FeedsSpec extends ObjectBehavior
 
  //
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Notification/EventsSpec.php

@@ -35,7 +35,7 @@ class EventsSpec extends ObjectBehavior
  ]))->shouldReturnArrayOfNotifications();
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  return [
  'returnArrayOfNotifications' => function ($array) {

Spec/Core/Notification/Extensions/PushSpec.php

@@ -293,7 +293,7 @@ class PushSpec extends ObjectBehavior
  ], $user, $entity)->shouldBe('@Bob wants to chat with you!');
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers['beAnArrayOf'] = function ($subject, $count, $class) {
  if (!is_array($subject) || ($count !== null && count($subject) !== $count)) {

Spec/Core/Notification/PostSubscriptions/RepositorySpec.php

@@ -260,7 +260,7 @@ class RepositorySpec extends ObjectBehavior
  ->shouldReturn(true);
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

Spec/Core/Reports/PreFeb2019RepositorySpec.php

@@ -273,7 +273,7 @@ class PreFeb2019RepositorySpec extends ObjectBehavior
  ->shouldReturn(false);
  }
 
- public function getMatchers()
+ public function getMatchers(): array
  {
  $matchers = [];
 

composer.json

@@ -5,37 +5,36 @@
  "php": "~7.1",
  "ext-redis": "~4.3",
  "aws/aws-sdk-php": "^3.38",
- "braintree/braintree_php": "3.5.0",
- "datastax/php-driver": "1.2.2",
+ "braintree/braintree_php": "^3.5.0",
+ "datastax/php-driver": "^1.2.2",
  "elasticsearch/elasticsearch": "^6.1",
  "facebook/php-sdk-v4": "~5.0",
- "firebase/php-jwt": "3.0.*",
+ "firebase/php-jwt": "^3.0",
  "kramnorth/cinemr-php-sdk": "dev-master@dev",
  "kickbox/kickbox": "*",
  "Minds/Surge": "dev-master@dev",
  "minds/mw3": "dev-master@dev",
- "neoxygen/neoclient": "^3.3",
- "paypal/rest-api-sdk-php": "1.3.2",
+ "paypal/rest-api-sdk-php": "^1.3.2",
  "phpmailer/phpmailer": "~5.2",
  "stripe/stripe-php": "^6.43",
  "thobbs/phpcassa": "dev-minds-legacy",
  "tijsverkoyen/twitteroauth": "dev-master@dev",
- "twilio/sdk": "5.26.*",
- "videlalvaro/php-amqplib": "dev-master@dev",
+ "twilio/sdk": "^5.26",
  "vscn/cruftflake": "dev-master#cab1b9ee9869072e7a58a1eb593b602ec5bedcd3",
  "zircote/swagger-php": "2.*@dev",
- "mongodb/mongodb": "1.0.5",
+ "mongodb/mongodb": "^1.0.5",
  "abraham/twitteroauth": "^0.6.4",
  "google/apiclient": "^2.0",
  "aws/aws-php-sns-message-validator": "^1.4",
  "giggsey/libphonenumber-for-php": "^8.8",
  "php-ffmpeg/php-ffmpeg": "^0.11.1",
  "erusev/parsedown": "^1.7",
- "zendframework/zend-diactoros": "1.8.6",
+ "zendframework/zend-diactoros": "^1.8.6",
  "league/oauth2-server": "7.2.0",
- "lcobucci/jwt": "3.2.4",
- "sentry/sdk": "2.0.3",
- "zendframework/zend-permissions-rbac": "^3.0"
+ "lcobucci/jwt": "^3.2.4",
+ "sentry/sdk": "^2.0.3",
+ "zendframework/zend-permissions-rbac": "^3.0",
+ "php-amqplib/php-amqplib": "^2.10"
  },
  "repositories": [
  {
@@ -66,9 +65,9 @@
  "bin-dir": "bin"
  },
  "require-dev": {
- "phpspec/phpspec": "~3.4",
- "leanphp/phpspec-code-coverage": "~3.1",
- "friendsofphp/php-cs-fixer": "*",
- "bossa/phpspec2-expect": "*"
+ "friendsofphp/php-cs-fixer": "^2.15",
+ "friends-of-phpspec/phpspec-code-coverage": "^4.3",
+ "phpspec/phpspec": "^5.0",
+ "bossa/phpspec2-expect": "^3.1"
  }
 }