diff options
| author | Ferenc Kovacs <tyra3l@gmail.com> | 2013-11-06 10:46:34 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyra3l@gmail.com> | 2013-11-06 10:46:34 +0100 |
| commit | 91108818e1554ed542a13148e6d8b79e29e77935 (patch) | |
| tree | 5a7214613ac0da55f6b23c615e900332be31b9fb /ext/spl/tests/SplFileObject_getflags_basic.phpt | |
| parent | 9d75b9fb27cd93c19cd168a486ab2efe2ce2aa78 (diff) | |
| parent | 8b6b39fdcffc8486fedd391b8d8aa7700f0c7f93 (diff) | |
| download | php-git-91108818e1554ed542a13148e6d8b79e29e77935.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
Diffstat (limited to 'ext/spl/tests/SplFileObject_getflags_basic.phpt')
| -rw-r--r-- | ext/spl/tests/SplFileObject_getflags_basic.phpt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/spl/tests/SplFileObject_getflags_basic.phpt b/ext/spl/tests/SplFileObject_getflags_basic.phpt index 5addadf380..88cf6861a2 100644 --- a/ext/spl/tests/SplFileObject_getflags_basic.phpt +++ b/ext/spl/tests/SplFileObject_getflags_basic.phpt @@ -7,16 +7,16 @@ Erwin Poeze <erwin.poeze@gmail.com> --FILE-- <?php -file_put_contents('testdata.csv', 'eerste;tweede;derde'); +file_put_contents('SplFileObject_getflags_basic.csv', 'eerste;tweede;derde'); -$fo = new SplFileObject('testdata.csv'); +$fo = new SplFileObject('SplFileObject_getflags_basic.csv'); $fo->setFlags(SplFileObject::DROP_NEW_LINE); var_dump($fo->getFlags()); ?> --CLEAN-- <?php -unlink('testdata.csv'); +unlink('SplFileObject_getflags_basic.csv'); ?> --EXPECT-- int(1) |