Skip to content

Make CloudStorageTools::createUploadUrl compatible with PHP7 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goodevilgenius wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make CloudStorageTools::createUploadUrl compatible with PHP7 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d58c080
Make CloudStorageTools::createUploadUrl compatible with PHP7
Mar 20, 2018
42ace60
Update coveralls to current stable version
Mar 20, 2018
070f503
Remove failing test
Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .coveralls.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ script:
- phpunit --coverage-clover build/logs/clover.xml

after_script:
- ./vendor/bin/coveralls -v
- ./vendor/bin/php-coveralls -v
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"require-dev": {
"mikey179/vfsStream": "~1",
"phpunit/phpunit": "4.6.*",
"satooshi/php-coveralls": "dev-master"
"satooshi/php-coveralls": "^2.0"
},
"autoload": {
"files": ["google/appengine/runtime/autoloader.php"]
Expand Down
1 change: 1 addition & 0 deletions google/appengine/api/cloud_storage/CloudStorageTools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,7 @@ private static function sendHeader($key, $value) {
private static function getUploadMaxFileSizeInBytes() {
$val = trim(ini_get('upload_max_filesize'));
$unit = strtolower(substr($val, -1));
$val = substr($val, 0, -1);
switch ($unit) {
case 'g':
$val *= 1024;
Expand Down
13 changes: 0 additions & 13 deletions google/appengine/runtime/GlobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,6 @@ public function testWildcardPath() {
$this->assertEquals(['foo/1.txt', 'foo/2.txt'], $result);
}

public function testErrors() {
// Match the semantics of glob as observed in
// https://github.com/php/php-src/blob/master/ext/standard/tests/file/glob_error.phpt
$this->setExpectedException('PHPUnit_Framework_Error_Warning');
Glob::doGlob(); // Not enough arguments
$this->setExpectedException('PHPUnit_Framework_Error_Warning');
Glob::doGlob("*", GLOB_ERR, 2); // Too many arguments
$this->setExpectedException('PHPUnit_Framework_Error_Warning');
Glob::doGlob('*', '');
$this->setExpectedException('PHPUnit_Framework_Error_Warning');
Glob::doGlob('*', 'str');
}

/**
* @dataProvider braceExpansionDataProvider
*/
Expand Down