Permalink
Browse files

upgrade bovigo/assert for preventing conflicts with zend.assertions!=1

 - bovigo/assert updated from v3.0.0 to v3.1.0
   See changes: mikey179/bovigo-assert@v3.0.0...v3.1.0
   Release notes: https://github.com/mikey179/bovigo-assert/releases/tag/v3.1.0

 - myclabs/deep-copy updated from 1.6.1 to 1.7.0
   See changes: myclabs/DeepCopy@1.6.1...1.7.0
   Release notes: https://github.com/myclabs/DeepCopy/releases/tag/1.7.0

 - phpunit/phpunit updated from 6.3.0 to 6.4.3
   See changes: sebastianbergmann/phpunit@6.3.0...6.4.3
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/6.4.3
  • Loading branch information...
mikey179 committed Oct 30, 2017
1 parent 98f9e13 commit 2ba78fdba99556871d2512e7876eb63098a1b071
Showing with 371 additions and 369 deletions.
  1. +2 −2 composer.json
  2. +26 −23 composer.lock
  3. +8 −8 src/test/php/org/bovigo/vfs/DirectoryIterationTestCase.php
  4. +3 −3 src/test/php/org/bovigo/vfs/FilenameTestCase.php
  5. +2 −2 src/test/php/org/bovigo/vfs/Issue104TestCase.php
  6. +0 −1 src/test/php/org/bovigo/vfs/PermissionsTestCase.php
  7. +5 −5 src/test/php/org/bovigo/vfs/QuotaTestCase.php
  8. +19 −19 src/test/php/org/bovigo/vfs/content/LargeFileContentTestCase.php
  9. +19 −19 src/test/php/org/bovigo/vfs/content/StringBasedFileContentTestCase.php
  10. +5 −5 src/test/php/org/bovigo/vfs/vfsStreamBlockTestCase.php
  11. +3 −3 src/test/php/org/bovigo/vfs/vfsStreamContainerIteratorTestCase.php
  12. +5 −5 src/test/php/org/bovigo/vfs/vfsStreamDirectoryIssue18TestCase.php
  13. +19 −19 src/test/php/org/bovigo/vfs/vfsStreamDirectoryTestCase.php
  14. +2 −2 src/test/php/org/bovigo/vfs/vfsStreamExLockTestCase.php
  15. +40 −40 src/test/php/org/bovigo/vfs/vfsStreamFileTestCase.php
  16. +2 −2 src/test/php/org/bovigo/vfs/vfsStreamResolveIncludePathTestCase.php
  17. +36 −36 src/test/php/org/bovigo/vfs/vfsStreamTestCase.php
  18. +16 −16 src/test/php/org/bovigo/vfs/vfsStreamUmaskTestCase.php
  19. +2 −2 src/test/php/org/bovigo/vfs/vfsStreamWrapperDirSeparatorTestCase.php
  20. +12 −12 src/test/php/org/bovigo/vfs/vfsStreamWrapperDirTestCase.php
  21. +31 −31 src/test/php/org/bovigo/vfs/vfsStreamWrapperFileTestCase.php
  22. +37 −37 src/test/php/org/bovigo/vfs/vfsStreamWrapperFileTimesTestCase.php
  23. +4 −4 src/test/php/org/bovigo/vfs/vfsStreamWrapperLargeFileTestCase.php
  24. +17 −17 src/test/php/org/bovigo/vfs/vfsStreamWrapperQuotaTestCase.php
  25. +2 −2 src/test/php/org/bovigo/vfs/vfsStreamWrapperSetOptionTestCase.php
  26. +40 −40 src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php
  27. +2 −2 src/test/php/org/bovigo/vfs/vfsStreamWrapperUnregisterTestCase.php
  28. +2 −2 src/test/php/org/bovigo/vfs/vfsStreamZipTestCase.php
  29. +5 −5 src/test/php/org/bovigo/vfs/visitor/vfsStreamPrintVisitorTestCase.php
  30. +5 −5 src/test/php/org/bovigo/vfs/visitor/vfsStreamStructureVisitorTestCase.php
View
@@ -20,9 +20,9 @@
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^6.3",
"phpunit/phpunit": "^6.4",
"bovigo/callmap": "^4.0",
"bovigo/assert": "^3.0"
"bovigo/assert": "^3.1"
},
"autoload": {
"psr-0": { "org\\bovigo\\vfs\\": "src/main/php" }
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -11,7 +11,7 @@
namespace org\bovigo\vfs;
require_once __DIR__ . '/vfsStreamWrapperBaseTestCase.php';
use function bovigo\assert\assert;
use function bovigo\assert\assertThat;
use function bovigo\assert\assertTrue;
use function bovigo\assert\predicate\equals;
use function bovigo\assert\predicate\isOfSize;
@@ -41,7 +41,7 @@ public function provideSwitchWithExpectations(): array
private function assertDirectoryCount(int $expectedCount, int $actualCount)
{
assert(
assertThat(
$actualCount,
equals($expectedCount),
'Directory root contains ' . $expectedCount . ' children, but got ' . $actualCount . ' children while iterating over directory contents'
@@ -178,8 +178,8 @@ public function directoryIteration_Bug_4(callable $switchDotFiles, array $expect
closedir($handle);
}
assert($list1, equals($list2));
assert($list1, isOfSize(2));
assertThat($list1, equals($list2));
assertThat($list1, isOfSize(2));
}
/**
@@ -213,8 +213,8 @@ public function directoryIterationShouldBeIndependent(callable $switchDotFiles,
closedir($handle1);
closedir($handle2);
assert($list1, equals($list2));
assert($list1, isOfSize(2));
assertThat($list1, equals($list2));
assertThat($list1, isOfSize(2));
}
/**
@@ -248,7 +248,7 @@ public function recursiveDirectoryIterationWithDotsEnabled()
$pathes[] = $fullFileName;
}
assert($pathes, equals([
assertThat($pathes, equals([
'vfs://root'.DIRECTORY_SEPARATOR.'.',
'vfs://root'.DIRECTORY_SEPARATOR.'..',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'.',
@@ -296,7 +296,7 @@ public function recursiveDirectoryIterationWithDotsDisabled()
$pathes[] = $fullFileName;
}
assert($pathes, equals([
assertThat($pathes, equals([
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'test.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'other.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'Invalid.csv',
@@ -11,7 +11,7 @@
namespace org\bovigo\vfs;
use PHPUnit\Framework\TestCase;
use function bovigo\assert\assert;
use function bovigo\assert\assertThat;
use function bovigo\assert\expect;
use function bovigo\assert\predicate\contains;
use function bovigo\assert\predicate\equals;
@@ -49,7 +49,7 @@ public function worksWithCorrectName()
$results[] = $f->getPathname();
}
assert($results, equals([
assertThat($results, equals([
'vfs://root/lost+found' . DIRECTORY_SEPARATOR . '.',
'vfs://root/lost+found' . DIRECTORY_SEPARATOR . '..'
]));
@@ -77,7 +77,7 @@ public function returnsCorrectNames()
$results[] = $f->getPathname();
}
assert($results, equals([
assertThat($results, equals([
'vfs://root' . DIRECTORY_SEPARATOR . '.',
'vfs://root' . DIRECTORY_SEPARATOR . '..',
'vfs://root' . DIRECTORY_SEPARATOR . 'lost+found'
@@ -11,7 +11,7 @@
namespace org\bovigo\vfs;
use PHPUnit\Framework\TestCase;
use function bovigo\assert\assert;
use function bovigo\assert\assertThat;
use function bovigo\assert\assertTrue;
use function bovigo\assert\predicate\equals;
/**
@@ -46,7 +46,7 @@ public function vfsStreamCanHandleUrlEncodedPathPassedByInternalPhpCode()
*/
public function vfsStreamCanHandleUrlEncodedPath()
{
assert(
assertThat(
file_get_contents(vfsStream::url('root/foo bar/schema.xsd')),
equals($this->content)
);
@@ -11,7 +11,6 @@
namespace org\bovigo\vfs;
use PHPUnit\Framework\TestCase;
use function bovigo\assert\assert;
use function bovigo\assert\assertFalse;
use function bovigo\assert\expect;
/**
@@ -11,7 +11,7 @@
namespace org\bovigo\vfs;
use PHPUnit\Framework\TestCase;
use function bovigo\assert\assert;
use function bovigo\assert\assertThat;
use function bovigo\assert\assertFalse;
use function bovigo\assert\assertTrue;
use function bovigo\assert\predicate\equals;
@@ -58,30 +58,30 @@ public function limitedQuotaIsLimited()
*/
public function unlimitedQuotaHasAlwaysSpaceLeft()
{
assert(Quota::unlimited()->spaceLeft(303), equals(303));
assertThat(Quota::unlimited()->spaceLeft(303), equals(303));
}
/**
* @test
*/
public function hasNoSpaceLeftWhenUsedSpaceIsLargerThanQuota()
{
assert($this->quota->spaceLeft(11), equals(0));
assertThat($this->quota->spaceLeft(11), equals(0));
}
/**
* @test
*/
public function hasNoSpaceLeftWhenUsedSpaceIsEqualToQuota()
{
assert($this->quota->spaceLeft(10), equals(0));
assertThat($this->quota->spaceLeft(10), equals(0));
}
/**
* @test
*/
public function hasSpaceLeftWhenUsedSpaceIsLowerThanQuota()
{
assert($this->quota->spaceLeft(9), equals(1));
assertThat($this->quota->spaceLeft(9), equals(1));
}
}
Oops, something went wrong.

0 comments on commit 2ba78fd

Please sign in to comment.