Skip to content

Commit 431c1df

Browse files
authored
Merge branch 'master' into cake4
2 parents 2914d14 + f552281 commit 431c1df

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

.travis.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ php:
55
- 7.4
66

77
env:
8-
matrix:
9-
- DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
108
global:
119
- DEFAULT=1
1210

@@ -19,7 +17,7 @@ matrix:
1917
env: CHECKS=1 DEFAULT=0
2018

2119
- php: 7.3
22-
env: CODECOVERAGE=1 DEFAULT=0 DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
20+
env: CODECOVERAGE=1 DEFAULT=0
2321

2422
fast_finish: true
2523

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
A CakePHP plugin to
1010
- easily use code syntax highlighters.
1111

12-
This branch is for **CakePHP 4.0+**.
12+
This branch is for **CakePHP 4.0+**. See [version map](https://github.com/dereuromark/cakephp-markup/wiki#cakephp-version-map) for details.
1313

1414
## Setup
1515
```

phpunit.xml.dist

-9
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
<!-- Add plugin test suites here. -->
2020
</testsuites>
2121

22-
<!-- Setup a listener for fixtures -->
23-
<listeners>
24-
<listener class="Cake\TestSuite\Fixture\FixtureInjector">
25-
<arguments>
26-
<object class="Cake\TestSuite\Fixture\FixtureManager"/>
27-
</arguments>
28-
</listener>
29-
</listeners>
30-
3122
<filter>
3223
<whitelist>
3324
<directory suffix=".php">src/</directory>

0 commit comments

Comments
 (0)