Skip to content

Commit 8508921

Browse files
authored
Merge pull request #42 from facile-it/cleanup
Do some routine cleanup
2 parents 6cea37d + afff434 commit 8508921

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+20
-17
lines changed

composer.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
],
2828
"autoload": {
2929
"psr-4": {
30-
"Moka\\": "src/Moka/"
30+
"Moka\\": "src/"
3131
},
3232
"files": [
33-
"src/Moka/Plugin/Mockery/MockeryPlugin.php",
34-
"src/Moka/Plugin/Mockery/moka.php",
35-
"src/Moka/Plugin/Phake/PhakePlugin.php",
36-
"src/Moka/Plugin/Phake/moka.php",
37-
"src/Moka/Plugin/PHPUnit/PHPUnitPlugin.php",
38-
"src/Moka/Plugin/PHPUnit/moka.php",
39-
"src/Moka/Plugin/Prophecy/ProphecyPlugin.php",
40-
"src/Moka/Plugin/Prophecy/moka.php"
33+
"src/Plugin/Mockery/MockeryPlugin.php",
34+
"src/Plugin/Mockery/moka.php",
35+
"src/Plugin/Phake/PhakePlugin.php",
36+
"src/Plugin/Phake/moka.php",
37+
"src/Plugin/PHPUnit/PHPUnitPlugin.php",
38+
"src/Plugin/PHPUnit/moka.php",
39+
"src/Plugin/Prophecy/ProphecyPlugin.php",
40+
"src/Plugin/Prophecy/moka.php"
4141
]
4242
},
4343
"autoload-dev": {
@@ -53,15 +53,18 @@
5353
},
5454
"require-dev": {
5555
"friendsofphp/php-cs-fixer": "^2.3",
56-
"phpunit/phpunit": "^6.0",
57-
"phpspec/prophecy": "^1.7",
56+
"mockery/mockery": "^0.9.9",
5857
"phake/phake": "^3.0",
59-
"mockery/mockery": "^0.9.9"
58+
"phpspec/prophecy": "^1.7",
59+
"phpunit/phpunit": "^6.0"
6060
},
6161
"suggest": {
6262
"phpspec/prophecy": "To allow loading of ProphecyPlugin",
6363
"mockery/mockery": "To allow loading of MockeryPlugin",
6464
"phake/phake": "To allow loading of PhakePlugin",
6565
"facile-it/paraunit": "For parallel test running; it's faster!"
66+
},
67+
"config": {
68+
"sort-packages": true
6669
}
6770
}

phpunit.xml.dist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<whitelist>
2525
<directory>src</directory>
2626
<exclude>
27-
<directory>src/Moka/Exception</directory>
28-
<directory suffix="moka.php">src/Moka/Plugin/*</directory>
29-
<directory>src/Moka/Tests</directory>
30-
<directory>src/Moka/Traits</directory>
27+
<directory>src/Exception</directory>
28+
<directory suffix="moka.php">src/Plugin/*</directory>
29+
<directory>src/Tests</directory>
30+
<directory>src/Traits</directory>
3131
</exclude>
3232
</whitelist>
3333
</filter>
File renamed without changes.

0 commit comments

Comments
 (0)