Merge pull request #6 from publicwhip/rb-0.4.4

Milestone 0.4.4

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
  - run:
  name: Checking composer.lock
  command: composer validate --no-check-all --strict
- 
+
  # Download and cache dependencies
  - restore_cache:
  keys:

.phpstorm.meta.php

@@ -1,12 +1,40 @@
 <?php
 namespace PHPSTORM_META
 {
- $STATIC_METHOD_TYPES = [
- \Psr\Container\ContainerInterface::get('') => [
- "" == "@",
- ],
- \DI\Container::get('') => [
- "" == "@",
- ],
- ];
+ override(
+ \Psr\Container\ContainerInterface::get(0),
+ map([
+ '' => '@',
+ ])
+ );
+ override(
+ \DI\Container::get(0),
+ map([
+ '' => '@',
+ ])
+ );
+ override(
+ \PHPUnit\Framework\TestCase::createMock(0),
+ map([
+ '' => '@|\PHPUnit\Framework\MockObject\MockObject',
+ ])
+ );
+ override(
+ \PHPUnit\Framework\TestCase::getMockForAbstractClass(0),
+ map([
+ '' => '@|\PHPUnit\Framework\MockObject\MockObject',
+ ])
+ );
+ override(
+ \PHPUnit_Framework_TestCase::createMock(0),
+ map([
+ '' => '@|\PHPUnit_Framework_MockObject_MockObject',
+ ])
+ );
+ override(
+ \PHPUnit_Framework_TestCase::getMockForAbstractClass(0),
+ map([
+ '' => '@|\PHPUnit_Framework_MockObject_MockObject',
+ ])
+ );
 }

composer.json

@@ -8,6 +8,7 @@
  "ext-json": "*",
  "ext-pdo": "*",
  "ext-sodium": "*",
+ "ext-ctype": " *",
  "erusev/parsedown": "^1.7",
  "illuminate/container": "^5.8",
  "illuminate/contracts": "^5.8",
@@ -38,6 +39,7 @@
  "phpmd/phpmd": "^2",
  "phpro/grumphp": "^0.15",
  "phpstan/phpstan": "^0.11",
+ "phpstan/phpstan-deprecation-rules": "^0.11.0",
  "phpstan/phpstan-phpunit": "^0.11.0",
  "phpstan/phpstan-strict-rules": "^0.11",
  "phpunit/phpunit": "^8",
@@ -51,10 +53,9 @@
  "scripts": {
  "phpcs": "phpcs --standard=./phpcs.xml -s",
  "test": "phpunit",
- "format-code": "php-cs-fixer fix --allow-risky=yes",
- "phpstan": "phpstan analyse -l 7 -c ./phpstan.neon src ./src ./tests",
- "phpcbf": "phpcbf --standard=./phpcs.xml ./src",
- "phpmd": "phpmd ./src,./tests text ./phpmd.xml",
+ "phpstan": "phpstan analyse -l 7 -c ./phpstan.neon src",
+ "phpcbf": "phpcbf --standard=./phpcs.xml",
+ "phpmd": "phpmd src/,tests/ text ./phpmd.xml",
  "grumphp": "grumphp run"
  },
  "license": "MIT",

docker/README.md

@@ -18,6 +18,7 @@ Internally, it has the following images:
 The alpine images can be access via ssh using:
 
 `docker exec -it publicwhip-nginx /bin/ash`
+`docker exec -it publicwhip-php /bin/ash`
 
 whilst the others can be accessed using
 

docker/docker-compose.yml

@@ -6,6 +6,7 @@ services:
  container_name: publicwhip-nginx
  ports:
  - "80:80"
+ - "81:81"
  - "443:443"
  volumes:
  - ../:/data/