Skip to content

Commit

Permalink
Merge pull request #92 from wunderio/feature/#91-finder-version
Browse files Browse the repository at this point in the history
#91. Changed finder constraint
  • Loading branch information
hkirsman authored May 4, 2023
2 parents 87129b5 + 86ac4d5 commit a4c53f1
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
# Install all dependencies and run check tasks.
build_and_test:
docker:
- image: circleci/php:8.0-cli-node
- image: cimg/php:8.1
steps:
# Check out source code.
- checkout
Expand Down
12 changes: 12 additions & 0 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: code-quality
recipe: lamp
config:
php: '8.1'
xdebug: true

tooling:
phpunit:
service: appserver
description: Run Drupal PHPUnit tests. Run 'lando phpunit --help' for more information.
cmd:
- "/app/.lando/tooling-phpunit.sh"
14 changes: 14 additions & 0 deletions .lando/tooling-phpunit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

#
# Helper script to run drupal tests.
#

set -euo pipefail
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/app/vendor/bin
install -d /app/public/simpletest/browser_output
cd /app/
XDEBUG_MODE=debug php \
/app/vendor/bin/phpunit \
--configuration /app/phpunit.xml \
"$@"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This repository currently has the following checks:
## Pre-requisites

* Composer
* PHP >= 7.1
* PHP >= 7.3

## Installation

Expand Down
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"phpstan/phpstan-deprecation-rules": "^1.0",
"vimeo/psalm": "^4",
"nette/finder": "^2.5",
"symfony/finder": "^4.4"
"symfony/finder": "^4.4 || ^5.3 || ^6"
},
"autoload": {
"psr-4": {
Expand All @@ -55,5 +55,11 @@
},
"require-dev": {
"phpunit/phpunit": "^8.3"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpro/grumphp": true
}
}
}
2 changes: 1 addition & 1 deletion tests/AbstractSinglePathProcessingTaskTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public function testHandlesParallelProcess(): void {
$this->process
->expects($this->exactly(2))
->method('isRunning')
->willReturnOnConsecutiveCalls([TRUE, FALSE]);
->willReturnOnConsecutiveCalls(TRUE, FALSE);
$this->process
->expects($this->once())
->method('isSuccessful')
Expand Down

0 comments on commit a4c53f1

Please sign in to comment.