Skip to content

Commit 43c3140

Browse files
committed
Merge pull request #77 from php-http/puli_fix
Fix Puli issue on PHP 5.6
2 parents c796537 + 113fcf1 commit 43c3140

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
- Client factories for Buzz.
88

99

10+
### Fixed
11+
12+
- Puli autoload issue on >=PHP 5.6, see [puli/issues#190](https://github.com/puli/issues/issues/190)
13+
14+
1015
## 1.0.0 - 2016-03-04
1116

1217
### Added

Tests/autoload.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
$loader = require __DIR__.'/../vendor/autoload.php';
4+
5+
// Temporary fix for Puli
6+
if (PHP_VERSION_ID >= 50600) {
7+
$loader->addClassMap([
8+
'Puli\\GeneratedPuliFactory' => __DIR__.'/../.puli/GeneratedPuliFactory.php',
9+
]);
10+
}

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit bootstrap="./vendor/autoload.php"
3+
<phpunit bootstrap="./Tests/autoload.php"
44
colors="true"
55
convertErrorsToExceptions="true"
66
convertNoticesToExceptions="true"

0 commit comments

Comments
 (0)