Skip to content

Commit cf1d746

Browse files
committed
Merge branch 'master' into 5.5
2 parents fd267c9 + d572cf4 commit cf1d746

File tree

4 files changed

+158
-4
lines changed

4 files changed

+158
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ $decoded = is_json('{"foo":1,"bar":2,"baz":3}', true);
412412
413413
#### `str_lower()`
414414
415-
Converts string to lowercase:
415+
Converts string to lowercase, using `mb_strtolower` in `UTF-8` encoding:
416416
417417
```php
418418
$lower = str_lower('TeSt');
@@ -422,7 +422,7 @@ $lower = str_lower('TeSt');
422422
423423
#### `str_upper()`
424424
425-
Converts string to uppercase:
425+
Converts string to uppercase, using `mb_strtoupper` in `UTF-8` encoding:
426426
427427
```php
428428
$upper = str_upper('TeSt');

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"require-dev": {
2323
"phpunit/phpunit": "^6.0",
2424
"mockery/mockery": "^0.9",
25-
"illuminated/testing-tools": "^0.6"
25+
"illuminated/testing-tools": "5.5.*"
2626
},
2727
"autoload": {
2828
"files": ["src/autoload.php"],

composer.lock

Lines changed: 154 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpunit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit backupGlobals="false"
33
backupStaticAttributes="false"
4+
beStrictAboutTestsThatDoNotTestAnything="false"
45
bootstrap="vendor/autoload.php"
56
colors="true"
67
convertErrorsToExceptions="true"

0 commit comments

Comments
 (0)