[Pkg-owncloud-commits] [php-sabre-vobject] 288/341: Applied sabre/cs on vobject unittests.
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 13:35:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabre-vobject.
commit 46af71df80c0a655551f7966a3f3faadd4c3ce93
Author: Evert Pot <me at evertpot.com>
Date: Fri Jul 3 18:47:28 2015 -0400
Applied sabre/cs on vobject unittests.
---
tests/VObject/CliTest.php | 132 ++++-----
tests/VObject/Component/VAlarmTest.php | 56 ++--
tests/VObject/Component/VAvailabilityTest.php | 54 ++--
tests/VObject/Component/VCalendarTest.php | 28 +-
tests/VObject/Component/VCardTest.php | 74 ++---
tests/VObject/Component/VEventTest.php | 45 ++-
tests/VObject/Component/VFreeBusyTest.php | 8 +-
tests/VObject/Component/VJournalTest.php | 35 ++-
tests/VObject/Component/VTimeZoneTest.php | 7 +-
tests/VObject/Component/VTodoTest.php | 82 +++---
tests/VObject/ComponentTest.php | 188 ++++++------
tests/VObject/DateTimeParserTest.php | 305 ++++++++++----------
tests/VObject/DocumentTest.php | 8 +-
tests/VObject/ElementListTest.php | 12 +-
tests/VObject/EmClientTest.php | 1 -
tests/VObject/EmptyParameterTest.php | 12 +-
tests/VObject/EmptyValueIssueTest.php | 3 +-
tests/VObject/FreeBusyGeneratorTest.php | 90 +++---
tests/VObject/GoogleColonEscapingTest.php | 2 +-
tests/VObject/ITip/BrokerAttendeeReplyTest.php | 252 ++++++++--------
tests/VObject/ITip/BrokerDeleteEventTest.php | 70 ++---
tests/VObject/ITip/BrokerNewEventTest.php | 163 ++++++-----
tests/VObject/ITip/BrokerTester.php | 24 +-
tests/VObject/ITip/BrokerUpdateEventTest.php | 306 ++++++++++----------
tests/VObject/ITip/EvolutionTest.php | 26 +-
tests/VObject/ITip/MessageTest.php | 6 +-
tests/VObject/Issue26Test.php | 4 -
tests/VObject/Issue36WorkAroundTest.php | 2 +-
tests/VObject/Issue40Test.php | 6 +-
tests/VObject/JCalTest.php | 170 +++++------
tests/VObject/JCardTest.php | 160 +++++------
tests/VObject/ParameterTest.php | 58 ++--
tests/VObject/Parser/JsonTest.php | 286 +++++++++----------
tests/VObject/Parser/MimeDirTest.php | 2 +-
tests/VObject/Parser/QuotedPrintableTest.php | 6 +-
tests/VObject/Property/BinaryTest.php | 2 +-
tests/VObject/Property/CompoundTest.php | 4 +-
tests/VObject/Property/FloatTest.php | 4 +-
.../VObject/Property/ICalendar/CalAddressTest.php | 10 +-
tests/VObject/Property/ICalendar/DateTimeTest.php | 28 +-
tests/VObject/Property/ICalendar/DurationTest.php | 4 +-
tests/VObject/Property/ICalendar/RecurTest.php | 18 +-
tests/VObject/Property/TextTest.php | 14 +-
tests/VObject/Property/VCard/DateAndOrTimeTest.php | 112 ++++----
tests/VObject/Property/VCard/LanguageTagTest.php | 2 +-
tests/VObject/PropertyTest.php | 135 +++++----
tests/VObject/ReaderTest.php | 40 +--
.../Recur/EventIterator/ByMonthInDailyTest.php | 9 +-
.../Recur/EventIterator/BySetPosHangTest.php | 9 +-
.../EventIterator/ExpandFloatingTimesTest.php | 4 +-
.../EventIterator/FifthTuesdayProblemTest.php | 2 +-
.../Recur/EventIterator/IncorrectExpandTest.php | 6 +-
.../EventIterator/InfiniteLoopProblemTest.php | 25 +-
tests/VObject/Recur/EventIterator/Issue48Test.php | 9 +-
tests/VObject/Recur/EventIterator/Issue50Test.php | 13 +-
tests/VObject/Recur/EventIterator/MainTest.php | 317 ++++++++++-----------
.../Recur/EventIterator/MissingOverriddenTest.php | 8 +-
.../Recur/EventIterator/NoInstancesTest.php | 2 +-
.../Recur/EventIterator/OverrideFirstEventTest.php | 4 +-
tests/VObject/Recur/RDateIteratorTest.php | 12 +-
tests/VObject/Recur/RRuleIteratorTest.php | 132 ++++-----
tests/VObject/SlashRTest.php | 2 +-
tests/VObject/Splitter/ICalendarTest.php | 26 +-
tests/VObject/Splitter/VCardTest.php | 18 +-
tests/VObject/TimeZoneUtilTest.php | 10 +-
tests/VObject/VCardConverterTest.php | 10 +-
tests/VObject/VersionTest.php | 2 +-
tests/bootstrap.php | 8 +-
68 files changed, 1819 insertions(+), 1865 deletions(-)
diff --git a/tests/VObject/CliTest.php b/tests/VObject/CliTest.php
index 9049c00..f0cfa2e 100644
--- a/tests/VObject/CliTest.php
+++ b/tests/VObject/CliTest.php
@@ -9,30 +9,30 @@ namespace Sabre\VObject;
*/
class CliTest extends \PHPUnit_Framework_TestCase {
- public function setUp() {
+ function setUp() {
$this->cli = new CliMock();
- $this->cli->stderr = fopen('php://memory','r+');
- $this->cli->stdout = fopen('php://memory','r+');
+ $this->cli->stderr = fopen('php://memory', 'r+');
+ $this->cli->stdout = fopen('php://memory', 'r+');
}
- public function testInvalidArg() {
+ function testInvalidArg() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', '--hi'))
+ $this->cli->main(['vobject', '--hi'])
);
rewind($this->cli->stderr);
$this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
}
- public function testQuiet() {
+ function testQuiet() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', '-q'))
+ $this->cli->main(['vobject', '-q'])
);
$this->assertTrue($this->cli->quiet);
@@ -41,22 +41,22 @@ class CliTest extends \PHPUnit_Framework_TestCase {
}
- public function testHelp() {
+ function testHelp() {
$this->assertEquals(
0,
- $this->cli->main(array('vobject', '-h'))
+ $this->cli->main(['vobject', '-h'])
);
rewind($this->cli->stderr);
$this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
}
- public function testFormat() {
+ function testFormat() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', '--format=jcard'))
+ $this->cli->main(['vobject', '--format=jcard'])
);
rewind($this->cli->stderr);
@@ -66,11 +66,11 @@ class CliTest extends \PHPUnit_Framework_TestCase {
}
- public function testFormatInvalid() {
+ function testFormatInvalid() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', '--format=foo'))
+ $this->cli->main(['vobject', '--format=foo'])
);
rewind($this->cli->stderr);
@@ -80,11 +80,11 @@ class CliTest extends \PHPUnit_Framework_TestCase {
}
- public function testInputFormatInvalid() {
+ function testInputFormatInvalid() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', '--inputformat=foo'))
+ $this->cli->main(['vobject', '--inputformat=foo'])
);
rewind($this->cli->stderr);
@@ -95,11 +95,11 @@ class CliTest extends \PHPUnit_Framework_TestCase {
}
- public function testNoInputFile() {
+ function testNoInputFile() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', 'color'))
+ $this->cli->main(['vobject', 'color'])
);
rewind($this->cli->stderr);
@@ -107,27 +107,27 @@ class CliTest extends \PHPUnit_Framework_TestCase {
}
- public function testTooManyArgs() {
+ function testTooManyArgs() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', 'color', 'a', 'b', 'c'))
+ $this->cli->main(['vobject', 'color', 'a', 'b', 'c'])
);
}
- public function testUnknownCommand() {
+ function testUnknownCommand() {
$this->assertEquals(
1,
- $this->cli->main(array('vobject', 'foo', '-'))
+ $this->cli->main(['vobject', 'foo', '-'])
);
}
- public function testConvertJson() {
+ function testConvertJson() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<ICS
BEGIN:VCARD
@@ -141,25 +141,25 @@ ICS
$this->assertEquals(
0,
- $this->cli->main(array('vobject', 'convert','--format=json', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=json', '-'])
);
rewind($this->cli->stdout);
$version = Version::VERSION;
$this->assertEquals(
- '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject '. $version .'\/\/EN"],["fn",{},"text","Cowboy Henk"]]]',
+ '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject ' . $version . '\/\/EN"],["fn",{},"text","Cowboy Henk"]]]',
stream_get_contents($this->cli->stdout)
);
}
- public function testConvertJCardPretty() {
+ function testConvertJCardPretty() {
if (version_compare(PHP_VERSION, '5.4.0') < 0) {
$this->markTestSkipped('This test required PHP 5.4.0');
}
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<ICS
BEGIN:VCARD
@@ -173,7 +173,7 @@ ICS
$this->assertEquals(
0,
- $this->cli->main(array('vobject', 'convert','--format=jcard', '--pretty', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=jcard', '--pretty', '-'])
);
rewind($this->cli->stdout);
@@ -196,9 +196,9 @@ JCARD;
}
- public function testConvertJCalFail() {
+ function testConvertJCalFail() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<ICS
BEGIN:VCARD
@@ -212,14 +212,14 @@ ICS
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'convert','--format=jcal', '--inputformat=mimedir', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=jcal', '--inputformat=mimedir', '-'])
);
}
- public function testConvertMimeDir() {
+ function testConvertMimeDir() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<JCARD
[
@@ -258,7 +258,7 @@ JCARD
$this->assertEquals(
0,
- $this->cli->main(array('vobject', 'convert','--format=mimedir', '--inputformat=json', '--pretty', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=mimedir', '--inputformat=json', '--pretty', '-'])
);
rewind($this->cli->stdout);
@@ -272,20 +272,20 @@ END:VCARD
VCF;
$this->assertEquals(
- strtr($expected, array("\n"=>"\r\n")),
+ strtr($expected, ["\n" => "\r\n"]),
stream_get_contents($this->cli->stdout)
);
}
- public function testConvertDefaultFormats() {
+ function testConvertDefaultFormats() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
$outputFile = SABRE_TEMPDIR . 'bar.json';
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'convert','foo.json',$outputFile))
+ $this->cli->main(['vobject', 'convert', 'foo.json', $outputFile])
);
$this->assertEquals('json', $this->cli->inputFormat);
@@ -293,13 +293,13 @@ VCF;
}
- public function testConvertDefaultFormats2() {
+ function testConvertDefaultFormats2() {
$outputFile = SABRE_TEMPDIR . 'bar.ics';
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'convert','foo.ics',$outputFile))
+ $this->cli->main(['vobject', 'convert', 'foo.ics', $outputFile])
);
$this->assertEquals('mimedir', $this->cli->inputFormat);
@@ -307,9 +307,9 @@ VCF;
}
- public function testVCard3040() {
+ function testVCard3040() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCARD
@@ -325,7 +325,7 @@ VCARD
$this->assertEquals(
0,
- $this->cli->main(array('vobject', 'convert','--format=vcard40', '--pretty', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=vcard40', '--pretty', '-'])
);
rewind($this->cli->stdout);
@@ -341,15 +341,15 @@ END:VCARD
VCF;
$this->assertEquals(
- strtr($expected, array("\n"=>"\r\n")),
+ strtr($expected, ["\n" => "\r\n"]),
stream_get_contents($this->cli->stdout)
);
}
- public function testVCard4030() {
+ function testVCard4030() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCARD
@@ -365,7 +365,7 @@ VCARD
$this->assertEquals(
0,
- $this->cli->main(array('vobject', 'convert','--format=vcard30', '--pretty', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=vcard30', '--pretty', '-'])
);
$version = Version::VERSION;
@@ -381,15 +381,15 @@ END:VCARD
VCF;
$this->assertEquals(
- strtr($expected, array("\n"=>"\r\n")),
+ strtr($expected, ["\n" => "\r\n"]),
stream_get_contents($this->cli->stdout)
);
}
- public function testVCard4021() {
+ function testVCard4021() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCARD
@@ -406,14 +406,14 @@ VCARD
// vCard 2.1 is not supported yet, so this returns a failure.
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'convert','--format=vcard21', '--pretty', '-'))
+ $this->cli->main(['vobject', 'convert', '--format=vcard21', '--pretty', '-'])
);
}
function testValidate() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCARD
@@ -427,7 +427,7 @@ VCARD
);
rewind($inputStream);
$this->cli->stdin = $inputStream;
- $result = $this->cli->main(array('vobject', 'validate', '-'));
+ $result = $this->cli->main(['vobject', 'validate', '-']);
$this->assertEquals(
0,
@@ -438,7 +438,7 @@ VCARD
function testValidateFail() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCALENDAR
@@ -452,14 +452,14 @@ VCARD
// vCard 2.1 is not supported yet, so this returns a failure.
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'validate', '-'))
+ $this->cli->main(['vobject', 'validate', '-'])
);
}
function testValidateFail2() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCALENDAR
@@ -473,14 +473,14 @@ VCARD
// vCard 2.1 is not supported yet, so this returns a failure.
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'validate', '-'))
+ $this->cli->main(['vobject', 'validate', '-'])
);
}
function testRepair() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCARD
@@ -494,7 +494,7 @@ VCARD
// vCard 2.1 is not supported yet, so this returns a failure.
$this->assertEquals(
2,
- $this->cli->main(array('vobject', 'repair', '-'))
+ $this->cli->main(['vobject', 'repair', '-'])
);
rewind($this->cli->stdout);
@@ -503,7 +503,7 @@ VCARD
function testRepairNothing() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
fwrite($inputStream, <<<VCARD
BEGIN:VCALENDAR
@@ -522,7 +522,7 @@ VCARD
$this->cli->stdin = $inputStream;
// vCard 2.1 is not supported yet, so this returns a failure.
- $result = $this->cli->main(array('vobject', 'repair', '-'));
+ $result = $this->cli->main(['vobject', 'repair', '-']);
rewind($this->cli->stderr);
$error = stream_get_contents($this->cli->stderr);
@@ -543,7 +543,7 @@ VCARD
*/
function testColorCalendar() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
$version = Version::VERSION;
@@ -570,7 +570,7 @@ VCARD
$this->cli->stdin = $inputStream;
// vCard 2.1 is not supported yet, so this returns a failure.
- $result = $this->cli->main(array('vobject', 'color', '-'));
+ $result = $this->cli->main(['vobject', 'color', '-']);
rewind($this->cli->stderr);
$error = stream_get_contents($this->cli->stderr);
@@ -591,7 +591,7 @@ VCARD
*/
function testColorVCard() {
- $inputStream = fopen('php://memory','r+');
+ $inputStream = fopen('php://memory', 'r+');
$version = Version::VERSION;
@@ -613,7 +613,7 @@ VCARD
$this->cli->stdin = $inputStream;
// vCard 2.1 is not supported yet, so this returns a failure.
- $result = $this->cli->main(array('vobject', 'color', '-'));
+ $result = $this->cli->main(['vobject', 'color', '-']);
rewind($this->cli->stderr);
$error = stream_get_contents($this->cli->stderr);
@@ -629,7 +629,7 @@ VCARD
class CliMock extends Cli {
- public $log = array();
+ public $log = [];
public $quiet = false;
diff --git a/tests/VObject/Component/VAlarmTest.php b/tests/VObject/Component/VAlarmTest.php
index 76dd2e3..8732aeb 100644
--- a/tests/VObject/Component/VAlarmTest.php
+++ b/tests/VObject/Component/VAlarmTest.php
@@ -2,7 +2,6 @@
namespace Sabre\VObject\Component;
-use Sabre\VObject\Component;
use DateTime;
use Sabre\VObject\Reader;
@@ -11,65 +10,65 @@ class VAlarmTest extends \PHPUnit_Framework_TestCase {
/**
* @dataProvider timeRangeTestData
*/
- public function testInTimeRange(VAlarm $valarm,$start,$end,$outcome) {
+ function testInTimeRange(VAlarm $valarm, $start, $end, $outcome) {
$this->assertEquals($outcome, $valarm->isInTimeRange($start, $end));
}
- public function timeRangeTestData() {
+ function timeRangeTestData() {
- $tests = array();
+ $tests = [];
$calendar = new VCalendar();
// Hard date and time
$valarm1 = $calendar->createComponent('VALARM');
$valarm1->add(
- $calendar->createProperty('TRIGGER', '20120312T130000Z', array('VALUE' => 'DATE-TIME'))
+ $calendar->createProperty('TRIGGER', '20120312T130000Z', ['VALUE' => 'DATE-TIME'])
);
- $tests[] = array($valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true);
- $tests[] = array($valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false);
+ $tests[] = [$valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true];
+ $tests[] = [$valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false];
// Relation to start time of event
$valarm2 = $calendar->createComponent('VALARM');
$valarm2->add(
- $calendar->createProperty('TRIGGER', '-P1D', array('VALUE' => 'DURATION'))
+ $calendar->createProperty('TRIGGER', '-P1D', ['VALUE' => 'DURATION'])
);
$vevent2 = $calendar->createComponent('VEVENT');
$vevent2->DTSTART = '20120313T130000Z';
$vevent2->add($valarm2);
- $tests[] = array($valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true);
- $tests[] = array($valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false);
+ $tests[] = [$valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true];
+ $tests[] = [$valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false];
// Relation to end time of event
$valarm3 = $calendar->createComponent('VALARM');
- $valarm3->add( $calendar->createProperty('TRIGGER', '-P1D', array('VALUE'=>'DURATION', 'RELATED' => 'END')) );
+ $valarm3->add($calendar->createProperty('TRIGGER', '-P1D', ['VALUE' => 'DURATION', 'RELATED' => 'END']));
$vevent3 = $calendar->createComponent('VEVENT');
$vevent3->DTSTART = '20120301T130000Z';
$vevent3->DTEND = '20120401T130000Z';
$vevent3->add($valarm3);
- $tests[] = array($valarm3, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false);
- $tests[] = array($valarm3, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true);
+ $tests[] = [$valarm3, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false];
+ $tests[] = [$valarm3, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true];
- // Relation to end time of todo
+ // Relation to end time of todo
$valarm4 = $calendar->createComponent('VALARM');
$valarm4->TRIGGER = '-P1D';
$valarm4->TRIGGER['VALUE'] = 'DURATION';
- $valarm4->TRIGGER['RELATED']= 'END';
+ $valarm4->TRIGGER['RELATED'] = 'END';
$vtodo4 = $calendar->createComponent('VTODO');
$vtodo4->DTSTART = '20120301T130000Z';
$vtodo4->DUE = '20120401T130000Z';
$vtodo4->add($valarm4);
- $tests[] = array($valarm4, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false);
- $tests[] = array($valarm4, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true);
+ $tests[] = [$valarm4, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false];
+ $tests[] = [$valarm4, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true];
// Relation to start time of event + repeat
$valarm5 = $calendar->createComponent('VALARM');
@@ -82,7 +81,7 @@ class VAlarmTest extends \PHPUnit_Framework_TestCase {
$vevent5->DTSTART = '20120301T130000Z';
$vevent5->add($valarm5);
- $tests[] = array($valarm5, new DateTime('2012-03-09 01:00:00'), new DateTime('2012-03-10 01:00:00'), true);
+ $tests[] = [$valarm5, new DateTime('2012-03-09 01:00:00'), new DateTime('2012-03-10 01:00:00'), true];
// Relation to start time of event + duration, but no repeat
$valarm6 = $calendar->createComponent('VALARM');
@@ -94,36 +93,36 @@ class VAlarmTest extends \PHPUnit_Framework_TestCase {
$vevent6->DTSTART = '20120313T130000Z';
$vevent6->add($valarm6);
- $tests[] = array($valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true);
- $tests[] = array($valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false);
+ $tests[] = [$valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true];
+ $tests[] = [$valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false];
// Relation to end time of event (DURATION instead of DTEND)
$valarm7 = $calendar->createComponent('VALARM');
$valarm7->TRIGGER = '-P1D';
$valarm7->TRIGGER['VALUE'] = 'DURATION';
- $valarm7->TRIGGER['RELATED']= 'END';
+ $valarm7->TRIGGER['RELATED'] = 'END';
$vevent7 = $calendar->createComponent('VEVENT');
$vevent7->DTSTART = '20120301T130000Z';
$vevent7->DURATION = 'P30D';
$vevent7->add($valarm7);
- $tests[] = array($valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false);
- $tests[] = array($valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true);
+ $tests[] = [$valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false];
+ $tests[] = [$valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true];
// Relation to end time of event (No DTEND or DURATION)
$valarm7 = $calendar->createComponent('VALARM');
$valarm7->TRIGGER = '-P1D';
$valarm7->TRIGGER['VALUE'] = 'DURATION';
- $valarm7->TRIGGER['RELATED']= 'END';
+ $valarm7->TRIGGER['RELATED'] = 'END';
$vevent7 = $calendar->createComponent('VEVENT');
$vevent7->DTSTART = '20120301T130000Z';
$vevent7->add($valarm7);
- $tests[] = array($valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), true);
- $tests[] = array($valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), false);
+ $tests[] = [$valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), true];
+ $tests[] = [$valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), false];
return $tests;
@@ -132,7 +131,7 @@ class VAlarmTest extends \PHPUnit_Framework_TestCase {
/**
* @expectedException LogicException
*/
- public function testInTimeRangeInvalidComponent() {
+ function testInTimeRangeInvalidComponent() {
$calendar = new VCalendar();
$valarm = $calendar->createComponent('VALARM');
@@ -149,7 +148,7 @@ class VAlarmTest extends \PHPUnit_Framework_TestCase {
/**
* This bug was found and reported on the mailing list.
*/
- public function testInTimeRangeBuggy() {
+ function testInTimeRangeBuggy() {
$input = <<<BLA
BEGIN:VCALENDAR
@@ -176,4 +175,3 @@ BLA;
}
}
-
diff --git a/tests/VObject/Component/VAvailabilityTest.php b/tests/VObject/Component/VAvailabilityTest.php
index 979a853..e94e451 100644
--- a/tests/VObject/Component/VAvailabilityTest.php
+++ b/tests/VObject/Component/VAvailabilityTest.php
@@ -4,8 +4,6 @@ namespace Sabre\VObject\Component;
use Sabre\VObject;
use Sabre\VObject\Reader;
-use Sabre\VObject\Component;
-use Sabre\VObject\Component\VAvailability;
/**
* We use `RFCxxx` has a placeholder for the
@@ -85,7 +83,7 @@ VCAL
function testRFCxxxSection3_1_availabilityprop_optional_once() {
- $properties = array(
+ $properties = [
'BUSYTYPE:BUSY',
'CLASS:PUBLIC',
'CREATED:20111005T135125Z',
@@ -97,17 +95,17 @@ VCAL
'SEQUENCE:0',
'SUMMARY:Bla bla',
'URL:http://example.org/'
- );
+ ];
// They are all present, only once.
$this->assertIsValid(Reader::read($this->template($properties)));
// We duplicate each one to see if it fails.
foreach ($properties as $property) {
- $this->assertIsNotValid(Reader::read($this->template(array(
+ $this->assertIsNotValid(Reader::read($this->template([
$property,
$property
- ))));
+ ])));
}
}
@@ -115,20 +113,20 @@ VCAL
function testRFCxxxSection3_1_availabilityprop_dtend_duration() {
// Only DTEND.
- $this->assertIsValid(Reader::read($this->template(array(
+ $this->assertIsValid(Reader::read($this->template([
'DTEND:21111005T133225Z'
- ))));
+ ])));
// Only DURATION.
- $this->assertIsValid(Reader::read($this->template(array(
+ $this->assertIsValid(Reader::read($this->template([
'DURATION:PT1H'
- ))));
+ ])));
// Both (not allowed).
- $this->assertIsNotValid(Reader::read($this->template(array(
+ $this->assertIsNotValid(Reader::read($this->template([
'DTEND:21111005T133225Z',
'DURATION:PT1H'
- ))));
+ ])));
}
function testAvailableSubComponent() {
@@ -243,42 +241,42 @@ VCAL
function testRFCxxxSection3_1_available_dtend_duration() {
// Only DTEND.
- $this->assertIsValid(Reader::read($this->templateAvailable(array(
+ $this->assertIsValid(Reader::read($this->templateAvailable([
'DTEND:21111005T133225Z'
- ))));
+ ])));
// Only DURATION.
- $this->assertIsValid(Reader::read($this->templateAvailable(array(
+ $this->assertIsValid(Reader::read($this->templateAvailable([
'DURATION:PT1H'
- ))));
+ ])));
// Both (not allowed).
- $this->assertIsNotValid(Reader::read($this->templateAvailable(array(
+ $this->assertIsNotValid(Reader::read($this->templateAvailable([
'DTEND:21111005T133225Z',
'DURATION:PT1H'
- ))));
+ ])));
}
function testRFCxxxSection3_1_available_optional_once() {
- $properties = array(
+ $properties = [
'CREATED:20111005T135125Z',
'DESCRIPTION:Long bla bla',
'LAST-MODIFIED:20111005T135325Z',
'RECURRENCE-ID;RANGE=THISANDFUTURE:19980401T133000Z',
'RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR',
'SUMMARY:Bla bla'
- );
+ ];
// They are all present, only once.
$this->assertIsValid(Reader::read($this->templateAvailable($properties)));
// We duplicate each one to see if it fails.
foreach ($properties as $property) {
- $this->assertIsNotValid(Reader::read($this->templateAvailable(array(
+ $this->assertIsNotValid(Reader::read($this->templateAvailable([
$property,
$property
- ))));
+ ])));
}
}
@@ -286,9 +284,9 @@ VCAL
$this->assertEquals(
'BUSY',
- Reader::read($this->templateAvailable(array(
+ Reader::read($this->templateAvailable([
'BUSYTYPE:BUSY'
- )))
+ ]))
->VAVAILABILITY
->AVAILABLE
->BUSYTYPE
@@ -297,9 +295,9 @@ VCAL
$this->assertEquals(
'BUSY-UNAVAILABLE',
- Reader::read($this->templateAvailable(array(
+ Reader::read($this->templateAvailable([
'BUSYTYPE:BUSY-UNAVAILABLE'
- )))
+ ]))
->VAVAILABILITY
->AVAILABLE
->BUSYTYPE
@@ -308,9 +306,9 @@ VCAL
$this->assertEquals(
'BUSY-TENTATIVE',
- Reader::read($this->templateAvailable(array(
+ Reader::read($this->templateAvailable([
'BUSYTYPE:BUSY-TENTATIVE'
- )))
+ ]))
->VAVAILABILITY
->AVAILABLE
->BUSYTYPE
diff --git a/tests/VObject/Component/VCalendarTest.php b/tests/VObject/Component/VCalendarTest.php
index 9c9db42..02c49f8 100644
--- a/tests/VObject/Component/VCalendarTest.php
+++ b/tests/VObject/Component/VCalendarTest.php
@@ -10,7 +10,7 @@ class VCalendarTest extends \PHPUnit_Framework_TestCase {
/**
* @dataProvider expandData
*/
- public function testExpand($input, $output, $timeZone = 'UTC', $start = '2011-12-01', $end = '2011-12-31') {
+ function testExpand($input, $output, $timeZone = 'UTC', $start = '2011-12-01', $end = '2011-12-31') {
$vcal = VObject\Reader::read($input);
@@ -29,9 +29,9 @@ class VCalendarTest extends \PHPUnit_Framework_TestCase {
}
- public function expandData() {
+ function expandData() {
- $tests = array();
+ $tests = [];
// No data
$input = 'BEGIN:VCALENDAR
@@ -41,7 +41,7 @@ END:VCALENDAR
';
$output = $input;
- $tests[] = array($input,$output);
+ $tests[] = [$input,$output];
// Simple events
@@ -72,7 +72,7 @@ END:VEVENT
END:VCALENDAR
';
- $tests[] = array($input, $output);
+ $tests[] = [$input, $output];
// Removing timezone info
$input = 'BEGIN:VCALENDAR
@@ -100,7 +100,7 @@ END:VEVENT
END:VCALENDAR
';
- $tests[] = array($input, $output);
+ $tests[] = [$input, $output];
// Recurrence rule
$input = 'BEGIN:VCALENDAR
@@ -157,7 +157,7 @@ END:VEVENT
END:VCALENDAR
';
- $tests[] = array($input, $output);
+ $tests[] = [$input, $output];
// Recurrence rule + override
$input = 'BEGIN:VCALENDAR
@@ -221,7 +221,7 @@ END:VEVENT
END:VCALENDAR
';
- $tests[] = array($input, $output);
+ $tests[] = [$input, $output];
// Floating dates and times.
$input = <<<ICS
@@ -266,7 +266,7 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array($input, $output, 'America/Argentina/Buenos_Aires', '2014-01-01', '2015-01-01');
+ $tests[] = [$input, $output, 'America/Argentina/Buenos_Aires', '2014-01-01', '2015-01-01'];
// Recurrence rule with no valid instances
$input = 'BEGIN:VCALENDAR
@@ -289,7 +289,7 @@ VERSION:2.0
END:VCALENDAR
';
- $tests[] = array($input, $output);
+ $tests[] = [$input, $output];
return $tests;
}
@@ -297,7 +297,7 @@ END:VCALENDAR
/**
* @expectedException LogicException
*/
- public function testBrokenEventExpand() {
+ function testBrokenEventExpand() {
$input = 'BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -339,7 +339,7 @@ END:VCALENDAR
';
$vcal = VObject\Reader::read($input);
- $this->assertEquals(array(), $vcal->validate(), 'Got an error');
+ $this->assertEquals([], $vcal->validate(), 'Got an error');
}
@@ -676,8 +676,8 @@ ICS;
function assertValidateResult($input, $expectedLevel, $expectedMessage = null) {
- $messages = array();
- foreach($input as $warning) {
+ $messages = [];
+ foreach ($input as $warning) {
$messages[] = $warning['message'];
}
diff --git a/tests/VObject/Component/VCardTest.php b/tests/VObject/Component/VCardTest.php
index d460ddc..b1d1fd5 100644
--- a/tests/VObject/Component/VCardTest.php
+++ b/tests/VObject/Component/VCardTest.php
@@ -15,8 +15,8 @@ class VCardTest extends \PHPUnit_Framework_TestCase {
$warnings = $vcard->validate();
- $warnMsg = array();
- foreach($warnings as $warning) {
+ $warnMsg = [];
+ foreach ($warnings as $warning) {
$warnMsg[] = $warning['message'];
}
@@ -31,87 +31,87 @@ class VCardTest extends \PHPUnit_Framework_TestCase {
}
- public function validateData() {
+ function validateData() {
- $tests = array();
+ $tests = [];
// Correct
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- array(),
+ [],
"BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- );
+ ];
// No VERSION
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- array(
+ [
'VERSION MUST appear exactly once in a VCARD component',
- ),
+ ],
"BEGIN:VCARD\r\nVERSION:3.0\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- );
+ ];
// Unknown version
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nVERSION:2.2\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- array(
+ [
'Only vcard version 4.0 (RFC6350), version 3.0 (RFC2426) or version 2.1 (icm-vcard-2.1) are supported.',
- ),
+ ],
"BEGIN:VCARD\r\nVERSION:2.1\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- );
+ ];
// No FN
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nEND:VCARD\r\n",
- array(
+ [
'The FN property must appear in the VCARD component exactly 1 time',
- ),
+ ],
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nEND:VCARD\r\n",
- );
+ ];
// No FN, N fallback
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;John;;;;;\r\nEND:VCARD\r\n",
- array(
+ [
'The FN property must appear in the VCARD component exactly 1 time',
- ),
+ ],
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;John;;;;;\r\nFN:John Doe\r\nEND:VCARD\r\n",
- );
+ ];
// No FN, N fallback, no first name
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;;;;;;\r\nEND:VCARD\r\n",
- array(
+ [
'The FN property must appear in the VCARD component exactly 1 time',
- ),
+ ],
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;;;;;;\r\nFN:Doe\r\nEND:VCARD\r\n",
- );
+ ];
// No FN, ORG fallback
- $tests[] = array(
+ $tests[] = [
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nORG:Acme Co.\r\nEND:VCARD\r\n",
- array(
+ [
'The FN property must appear in the VCARD component exactly 1 time',
- ),
+ ],
"BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nORG:Acme Co.\r\nFN:Acme Co.\r\nEND:VCARD\r\n",
- );
+ ];
return $tests;
}
function testGetDocumentType() {
- $vcard = new VCard(array(), false);
+ $vcard = new VCard([], false);
$vcard->VERSION = '2.1';
$this->assertEquals(VCard::VCARD21, $vcard->getDocumentType());
- $vcard = new VCard(array(), false);
+ $vcard = new VCard([], false);
$vcard->VERSION = '3.0';
$this->assertEquals(VCard::VCARD30, $vcard->getDocumentType());
- $vcard = new VCard(array(), false);
+ $vcard = new VCard([], false);
$vcard->VERSION = '4.0';
$this->assertEquals(VCard::VCARD40, $vcard->getDocumentType());
- $vcard = new VCard(array(), false);
+ $vcard = new VCard([], false);
$this->assertEquals(VCard::UNKNOWN, $vcard->getDocumentType());
}
@@ -270,8 +270,8 @@ VCF;
function assertValidateResult($input, $expectedLevel, $expectedMessage = null) {
- $messages = array();
- foreach($input as $warning) {
+ $messages = [];
+ foreach ($input as $warning) {
$messages[] = $warning['message'];
}
diff --git a/tests/VObject/Component/VEventTest.php b/tests/VObject/Component/VEventTest.php
index 0a78140..c8c75ed 100644
--- a/tests/VObject/Component/VEventTest.php
+++ b/tests/VObject/Component/VEventTest.php
@@ -2,58 +2,56 @@
namespace Sabre\VObject\Component;
-use Sabre\VObject;
-
class VEventTest extends \PHPUnit_Framework_TestCase {
/**
* @dataProvider timeRangeTestData
*/
- public function testInTimeRange(VEvent $vevent,$start,$end,$outcome) {
+ function testInTimeRange(VEvent $vevent, $start, $end, $outcome) {
$this->assertEquals($outcome, $vevent->isInTimeRange($start, $end));
}
- public function timeRangeTestData() {
+ function timeRangeTestData() {
- $tests = array();
+ $tests = [];
$calendar = new VCalendar();
$vevent = $calendar->createComponent('VEVENT');
$vevent->DTSTART = '20111223T120000Z';
- $tests[] = array($vevent, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vevent, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vevent, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vevent, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vevent2 = clone $vevent;
$vevent2->DTEND = '20111225T120000Z';
- $tests[] = array($vevent2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vevent2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vevent2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vevent2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vevent3 = clone $vevent;
$vevent3->DURATION = 'P1D';
- $tests[] = array($vevent3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vevent3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vevent3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vevent3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vevent4 = clone $vevent;
$vevent4->DTSTART = '20111225';
$vevent4->DTSTART['VALUE'] = 'DATE';
- $tests[] = array($vevent4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vevent4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vevent4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vevent4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
// Event with no end date should be treated as lasting the entire day.
- $tests[] = array($vevent4, new \DateTime('2011-12-25 16:00:00'), new \DateTime('2011-12-25 17:00:00'), true);
+ $tests[] = [$vevent4, new \DateTime('2011-12-25 16:00:00'), new \DateTime('2011-12-25 17:00:00'), true];
// DTEND is non inclusive so all day events should not be returned on the next day.
- $tests[] = array($vevent4, new \DateTime('2011-12-26 00:00:00'), new \DateTime('2011-12-26 17:00:00'), false);
+ $tests[] = [$vevent4, new \DateTime('2011-12-26 00:00:00'), new \DateTime('2011-12-26 17:00:00'), false];
// The timezone of timerange in question also needs to be considered.
- $tests[] = array($vevent4, new \DateTime('2011-12-26 00:00:00', new \DateTimeZone('Europe/Berlin')), new \DateTime('2011-12-26 17:00:00', new \DateTimeZone('Europe/Berlin')), false);
+ $tests[] = [$vevent4, new \DateTime('2011-12-26 00:00:00', new \DateTimeZone('Europe/Berlin')), new \DateTime('2011-12-26 17:00:00', new \DateTimeZone('Europe/Berlin')), false];
$vevent5 = clone $vevent;
$vevent5->DURATION = 'P1D';
$vevent5->RRULE = 'FREQ=YEARLY';
- $tests[] = array($vevent5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vevent5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
- $tests[] = array($vevent5, new \DateTime('2013-12-01'), new \DateTime('2013-12-31'), true);
+ $tests[] = [$vevent5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vevent5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
+ $tests[] = [$vevent5, new \DateTime('2013-12-01'), new \DateTime('2013-12-31'), true];
$vevent6 = clone $vevent;
$vevent6->DTSTART = '20111225';
@@ -61,19 +59,18 @@ class VEventTest extends \PHPUnit_Framework_TestCase {
$vevent6->DTEND = '20111225';
$vevent6->DTEND['VALUE'] = 'DATE';
- $tests[] = array($vevent6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vevent6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vevent6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vevent6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
- // Added this test to ensure that recurrence rules with no DTEND also
+ // Added this test to ensure that recurrence rules with no DTEND also
// get checked for the entire day.
$vevent7 = clone $vevent;
$vevent7->DTSTART = '20120101';
$vevent7->DTSTART['VALUE'] = 'DATE';
$vevent7->RRULE = 'FREQ=MONTHLY';
- $tests[] = array($vevent7, new \DateTime('2012-02-01 15:00:00'), new \DateTime('2012-02-02'), true);
+ $tests[] = [$vevent7, new \DateTime('2012-02-01 15:00:00'), new \DateTime('2012-02-02'), true];
return $tests;
}
}
-
diff --git a/tests/VObject/Component/VFreeBusyTest.php b/tests/VObject/Component/VFreeBusyTest.php
index 46acc69..2d463fd 100644
--- a/tests/VObject/Component/VFreeBusyTest.php
+++ b/tests/VObject/Component/VFreeBusyTest.php
@@ -38,7 +38,7 @@ BLA;
}
- public function testValidate() {
+ function testValidate() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -54,12 +54,12 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(), $messages);
+ $this->assertEquals([], $messages);
}
diff --git a/tests/VObject/Component/VJournalTest.php b/tests/VObject/Component/VJournalTest.php
index 10fc49f..1a2362d 100644
--- a/tests/VObject/Component/VJournalTest.php
+++ b/tests/VObject/Component/VJournalTest.php
@@ -10,13 +10,13 @@ class VJournalTest extends \PHPUnit_Framework_TestCase {
/**
* @dataProvider timeRangeTestData
*/
- public function testInTimeRange(VJournal $vtodo,$start,$end,$outcome) {
+ function testInTimeRange(VJournal $vtodo, $start, $end, $outcome) {
$this->assertEquals($outcome, $vtodo->isInTimeRange($start, $end));
}
- public function testValidate() {
+ function testValidate() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -32,16 +32,16 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(), $messages);
+ $this->assertEquals([], $messages);
}
- public function testValidateBroken() {
+ function testValidateBroken() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -59,38 +59,38 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
$this->assertEquals(
- array("URL MUST NOT appear more than once in a VJOURNAL component"),
+ ["URL MUST NOT appear more than once in a VJOURNAL component"],
$messages
);
}
- public function timeRangeTestData() {
+ function timeRangeTestData() {
$calendar = new VCalendar();
- $tests = array();
+ $tests = [];
$vjournal = $calendar->createComponent('VJOURNAL');
$vjournal->DTSTART = '20111223T120000Z';
- $tests[] = array($vjournal, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vjournal, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vjournal, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vjournal, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vjournal2 = $calendar->createComponent('VJOURNAL');
$vjournal2->DTSTART = '20111223';
$vjournal2->DTSTART['VALUE'] = 'DATE';
- $tests[] = array($vjournal2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vjournal2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vjournal2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vjournal2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vjournal3 = $calendar->createComponent('VJOURNAL');
- $tests[] = array($vjournal3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), false);
- $tests[] = array($vjournal3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vjournal3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), false];
+ $tests[] = [$vjournal3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
return $tests;
}
@@ -98,4 +98,3 @@ HI;
}
-
diff --git a/tests/VObject/Component/VTimeZoneTest.php b/tests/VObject/Component/VTimeZoneTest.php
index 92d07f8..f320fd3 100644
--- a/tests/VObject/Component/VTimeZoneTest.php
+++ b/tests/VObject/Component/VTimeZoneTest.php
@@ -2,7 +2,6 @@
namespace Sabre\VObject\Component;
-use Sabre\VObject;
use Sabre\VObject\Reader;
class VTimeZoneTest extends \PHPUnit_Framework_TestCase {
@@ -22,12 +21,12 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(), $messages);
+ $this->assertEquals([], $messages);
}
diff --git a/tests/VObject/Component/VTodoTest.php b/tests/VObject/Component/VTodoTest.php
index e536e7b..85c6e07 100644
--- a/tests/VObject/Component/VTodoTest.php
+++ b/tests/VObject/Component/VTodoTest.php
@@ -2,72 +2,71 @@
namespace Sabre\VObject\Component;
-use
- Sabre\VObject\Component,
- Sabre\VObject\Reader;
+use Sabre\VObject\Component;
+use Sabre\VObject\Reader;
class VTodoTest extends \PHPUnit_Framework_TestCase {
/**
* @dataProvider timeRangeTestData
*/
- public function testInTimeRange(VTodo $vtodo,$start,$end,$outcome) {
+ function testInTimeRange(VTodo $vtodo, $start, $end, $outcome) {
$this->assertEquals($outcome, $vtodo->isInTimeRange($start, $end));
}
- public function timeRangeTestData() {
+ function timeRangeTestData() {
- $tests = array();
+ $tests = [];
$calendar = new VCalendar();
$vtodo = $calendar->createComponent('VTODO');
$vtodo->DTSTART = '20111223T120000Z';
- $tests[] = array($vtodo, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo2 = clone $vtodo;
$vtodo2->DURATION = 'P1D';
- $tests[] = array($vtodo2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo3 = clone $vtodo;
$vtodo3->DUE = '20111225';
- $tests[] = array($vtodo3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo4 = $calendar->createComponent('VTODO');
$vtodo4->DUE = '20111225';
- $tests[] = array($vtodo4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo5 = $calendar->createComponent('VTODO');
$vtodo5->COMPLETED = '20111225';
- $tests[] = array($vtodo5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo6 = $calendar->createComponent('VTODO');
$vtodo6->CREATED = '20111225';
- $tests[] = array($vtodo6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo7 = $calendar->createComponent('VTODO');
$vtodo7->CREATED = '20111225';
$vtodo7->COMPLETED = '20111226';
- $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
+ $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
$vtodo7 = $calendar->createComponent('VTODO');
- $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
- $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), true);
+ $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
+ $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), true];
return $tests;
}
- public function testValidate() {
+ function testValidate() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -83,16 +82,16 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(), $messages);
+ $this->assertEquals([], $messages);
}
- public function testValidateInvalid() {
+ function testValidateInvalid() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -106,19 +105,19 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(
+ $this->assertEquals([
"UID MUST appear exactly once in a VTODO component",
"DTSTAMP MUST appear exactly once in a VTODO component",
- ), $messages);
+ ], $messages);
}
- public function testValidateDUEDTSTARTMisMatch() {
+ function testValidateDUEDTSTARTMisMatch() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -136,18 +135,18 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(
+ $this->assertEquals([
"The value type (DATE or DATE-TIME) must be identical for DUE and DTSTART",
- ), $messages);
+ ], $messages);
}
- public function testValidateDUEbeforeDTSTART() {
+ function testValidateDUEbeforeDTSTART() {
$input = <<<HI
BEGIN:VCALENDAR
@@ -165,16 +164,15 @@ HI;
$obj = Reader::read($input);
$warnings = $obj->validate();
- $messages = array();
- foreach($warnings as $warning) {
+ $messages = [];
+ foreach ($warnings as $warning) {
$messages[] = $warning['message'];
}
- $this->assertEquals(array(
+ $this->assertEquals([
"DUE must occur after DTSTART",
- ), $messages);
+ ], $messages);
}
}
-
diff --git a/tests/VObject/ComponentTest.php b/tests/VObject/ComponentTest.php
index 3bbe4d8..ddf5abc 100644
--- a/tests/VObject/ComponentTest.php
+++ b/tests/VObject/ComponentTest.php
@@ -2,15 +2,14 @@
namespace Sabre\VObject;
-use
- Sabre\VObject\Component\VCalendar,
- Sabre\VObject\Component\VCard;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VCard;
class ComponentTest extends \PHPUnit_Framework_TestCase {
function testIterate() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$sub = $comp->createComponent('VEVENT');
$comp->add($sub);
@@ -19,20 +18,20 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$comp->add($sub);
$count = 0;
- foreach($comp->children() as $key=>$subcomponent) {
+ foreach ($comp->children() as $key => $subcomponent) {
$count++;
- $this->assertInstanceOf('Sabre\\VObject\\Component',$subcomponent);
+ $this->assertInstanceOf('Sabre\\VObject\\Component', $subcomponent);
}
- $this->assertEquals(2,$count);
- $this->assertEquals(1,$key);
+ $this->assertEquals(2, $count);
+ $this->assertEquals(1, $key);
}
function testMagicGet() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$sub = $comp->createComponent('VEVENT');
$comp->add($sub);
@@ -52,13 +51,13 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$comp = new VCard();
- $sub = $comp->createProperty('GROUP1.EMAIL','1 at 1.com');
+ $sub = $comp->createProperty('GROUP1.EMAIL', '1 at 1.com');
$comp->add($sub);
- $sub = $comp->createProperty('GROUP2.EMAIL','2 at 2.com');
+ $sub = $comp->createProperty('GROUP2.EMAIL', '2 at 2.com');
$comp->add($sub);
- $sub = $comp->createProperty('EMAIL','3 at 3.com');
+ $sub = $comp->createProperty('EMAIL', '3 at 3.com');
$comp->add($sub);
$emails = $comp->email;
@@ -95,31 +94,31 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$comp = new VCalendar();
$comp->myProp = 'myValue';
- $this->assertInstanceOf('Sabre\\VObject\\Property',$comp->MYPROP);
- $this->assertEquals('myValue',(string)$comp->MYPROP);
+ $this->assertInstanceOf('Sabre\\VObject\\Property', $comp->MYPROP);
+ $this->assertEquals('myValue', (string)$comp->MYPROP);
}
function testMagicSetScalarTwice() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$comp->myProp = 'myValue';
$comp->myProp = 'myValue';
- $this->assertEquals(1,count($comp->children()));
- $this->assertInstanceOf('Sabre\\VObject\\Property',$comp->MYPROP);
- $this->assertEquals('myValue',(string)$comp->MYPROP);
+ $this->assertEquals(1, count($comp->children()));
+ $this->assertInstanceOf('Sabre\\VObject\\Property', $comp->MYPROP);
+ $this->assertEquals('myValue', (string)$comp->MYPROP);
}
function testMagicSetArray() {
$comp = new VCalendar();
- $comp->ORG = array('Acme Inc', 'Section 9');
+ $comp->ORG = ['Acme Inc', 'Section 9'];
- $this->assertInstanceOf('Sabre\\VObject\\Property',$comp->ORG);
- $this->assertEquals(array('Acme Inc', 'Section 9'),$comp->ORG->getParts());
+ $this->assertInstanceOf('Sabre\\VObject\\Property', $comp->ORG);
+ $this->assertEquals(['Acme Inc', 'Section 9'], $comp->ORG->getParts());
}
@@ -132,26 +131,26 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(1, count($comp));
- $this->assertEquals('VEVENT',$comp->VEVENT->name);
+ $this->assertEquals('VEVENT', $comp->VEVENT->name);
}
function testMagicSetTwice() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$comp->VEVENT = $comp->createComponent('VEVENT');
$comp->VEVENT = $comp->createComponent('VEVENT');
$this->assertEquals(1, count($comp->children()));
- $this->assertEquals('VEVENT',$comp->VEVENT->name);
+ $this->assertEquals('VEVENT', $comp->VEVENT->name);
}
function testArrayAccessGet() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$event = $comp->createComponent('VEVENT');
$event->summary = 'Event 1';
@@ -163,7 +162,7 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$comp->add($event2);
- $this->assertEquals(2,count($comp->children()));
+ $this->assertEquals(2, count($comp->children()));
$this->assertTrue($comp->vevent[1] instanceof Component);
$this->assertEquals('Event 2', (string)$comp->vevent[1]->summary);
@@ -209,64 +208,64 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testAddScalar() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
- $comp->add('myprop','value');
+ $comp->add('myprop', 'value');
$this->assertEquals(1, count($comp->children()));
$bla = $comp->children[0];
$this->assertTrue($bla instanceof Property);
- $this->assertEquals('MYPROP',$bla->name);
- $this->assertEquals('value',(string)$bla);
+ $this->assertEquals('MYPROP', $bla->name);
+ $this->assertEquals('value', (string)$bla);
}
function testAddScalarParams() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
- $comp->add('myprop','value',array('param1'=>'value1'));
+ $comp->add('myprop', 'value', ['param1' => 'value1']);
$this->assertEquals(1, count($comp->children()));
$bla = $comp->children[0];
$this->assertInstanceOf('Sabre\\VObject\\Property', $bla);
- $this->assertEquals('MYPROP',$bla->name);
+ $this->assertEquals('MYPROP', $bla->name);
$this->assertEquals('value', (string)$bla);
$this->assertEquals(1, count($bla->parameters()));
- $this->assertEquals('PARAM1',$bla->parameters['PARAM1']->name);
- $this->assertEquals('value1',$bla->parameters['PARAM1']->getValue());
+ $this->assertEquals('PARAM1', $bla->parameters['PARAM1']->name);
+ $this->assertEquals('value1', $bla->parameters['PARAM1']->getValue());
}
function testAddComponent() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$comp->add($comp->createComponent('VEVENT'));
$this->assertEquals(1, count($comp->children()));
- $this->assertEquals('VEVENT',$comp->VEVENT->name);
+ $this->assertEquals('VEVENT', $comp->VEVENT->name);
}
function testAddComponentTwice() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$comp->add($comp->createComponent('VEVENT'));
$comp->add($comp->createComponent('VEVENT'));
$this->assertEquals(2, count($comp->children()));
- $this->assertEquals('VEVENT',$comp->VEVENT->name);
+ $this->assertEquals('VEVENT', $comp->VEVENT->name);
}
@@ -276,7 +275,7 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testAddArgFail() {
$comp = new VCalendar();
- $comp->add($comp->createComponent('VEVENT'),'hello');
+ $comp->add($comp->createComponent('VEVENT'), 'hello');
}
@@ -286,13 +285,13 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testAddArgFail2() {
$comp = new VCalendar();
- $comp->add(array());
+ $comp->add([]);
}
function testMagicUnset() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$comp->add($comp->createComponent('VEVENT'));
unset($comp->vevent);
@@ -305,13 +304,13 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testCount() {
$comp = new VCalendar();
- $this->assertEquals(1,$comp->count());
+ $this->assertEquals(1, $comp->count());
}
function testChildren() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
// Note that 'myProp' is ignored here.
$comp->add($comp->createComponent('VEVENT'));
@@ -319,14 +318,14 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$r = $comp->children();
$this->assertInternalType('array', $r);
- $this->assertEquals(2,count($r));
+ $this->assertEquals(2, count($r));
}
function testGetComponents() {
$comp = new VCalendar();
- $comp->add($comp->createProperty('FOO','BAR'));
+ $comp->add($comp->createProperty('FOO', 'BAR'));
$comp->add($comp->createComponent('VTODO'));
$r = $comp->getComponents();
@@ -337,14 +336,14 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testSerialize() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$this->assertEquals("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n", $comp->serialize());
}
function testSerializeChildren() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$event = $comp->add($comp->createComponent('VEVENT'));
unset($event->DTSTAMP, $event->UID);
$comp->add($comp->createComponent('VTODO'));
@@ -357,10 +356,10 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testSerializeOrderCompAndProp() {
- $comp = new VCalendar(array(), false);
+ $comp = new VCalendar([], false);
$comp->add($event = $comp->createComponent('VEVENT'));
- $comp->add('PROP1','BLABLA');
- $comp->add('VERSION','2.0');
+ $comp->add('PROP1', 'BLABLA');
+ $comp->add('VERSION', '2.0');
$comp->add($comp->createComponent('VTIMEZONE'));
unset($event->DTSTAMP, $event->UID);
@@ -372,15 +371,15 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testAnotherSerializeOrderProp() {
- $prop4s=array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10');
+ $prop4s = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'];
- $comp = new VCard(array(), false);
+ $comp = new VCard([], false);
- $comp->__set('SOMEPROP','FOO');
- $comp->__set('ANOTHERPROP','FOO');
- $comp->__set('THIRDPROP','FOO');
+ $comp->__set('SOMEPROP', 'FOO');
+ $comp->__set('ANOTHERPROP', 'FOO');
+ $comp->__set('THIRDPROP', 'FOO');
foreach ($prop4s as $prop4) {
- $comp->add('PROP4', 'FOO '.$prop4);
+ $comp->add('PROP4', 'FOO ' . $prop4);
}
$comp->__set('PROPNUMBERFIVE', 'FOO');
$comp->__set('PROPNUMBERSIX', 'FOO');
@@ -388,7 +387,7 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$comp->__set('PROPNUMBEREIGHT', 'FOO');
$comp->__set('PROPNUMBERNINE', 'FOO');
$comp->__set('PROPNUMBERTEN', 'FOO');
- $comp->__set('VERSION','2.0');
+ $comp->__set('VERSION', '2.0');
$comp->__set('UID', 'FOO');
$str = $comp->serialize();
@@ -399,12 +398,12 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testInstantiateWithChildren() {
- $comp = new VCard(array(
- 'ORG' => array('Acme Inc.', 'Section 9'),
- 'FN' => 'Finn The Human',
- ));
+ $comp = new VCard([
+ 'ORG' => ['Acme Inc.', 'Section 9'],
+ 'FN' => 'Finn The Human',
+ ]);
- $this->assertEquals(array('Acme Inc.', 'Section 9'), $comp->ORG->getParts());
+ $this->assertEquals(['Acme Inc.', 'Section 9'], $comp->ORG->getParts());
$this->assertEquals('Finn The Human', $comp->FN->getValue());
}
@@ -412,9 +411,9 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testInstantiateSubComponent() {
$comp = new VCalendar();
- $event = $comp->createComponent('VEVENT', array(
+ $event = $comp->createComponent('VEVENT', [
$comp->createProperty('UID', '12345'),
- ));
+ ]);
$comp->add($event);
$this->assertEquals('12345', $comp->VEVENT->UID->getValue());
@@ -423,10 +422,10 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testRemoveByName() {
- $comp = new VCalendar(array(), false);
- $comp->add('prop1','val1');
- $comp->add('prop2','val2');
- $comp->add('prop2','val2');
+ $comp = new VCalendar([], false);
+ $comp->add('prop1', 'val1');
+ $comp->add('prop2', 'val2');
+ $comp->add('prop2', 'val2');
$comp->remove('prop2');
$this->assertFalse(isset($comp->prop2));
@@ -436,9 +435,9 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function testRemoveByObj() {
- $comp = new VCalendar(array(), false);
- $comp->add('prop1','val1');
- $prop = $comp->add('prop2','val2');
+ $comp = new VCalendar([], false);
+ $comp->add('prop1', 'val1');
+ $prop = $comp->add('prop2', 'val2');
$comp->remove($prop);
$this->assertFalse(isset($comp->prop2));
@@ -451,8 +450,8 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
*/
function testRemoveNotFound() {
- $comp = new VCalendar(array(), false);
- $prop = $comp->createProperty('A','B');
+ $comp = new VCalendar([], false);
+ $prop = $comp->createProperty('A', 'B');
$comp->remove($prop);
}
@@ -464,9 +463,9 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$vcard = new Component\VCard();
- $component = new FakeComponent($vcard,'Hi', array(), $defaults = false );
- foreach($componentList as $v) {
- $component->add($v,'Hello.');
+ $component = new FakeComponent($vcard, 'Hi', [], $defaults = false);
+ foreach ($componentList as $v) {
+ $component->add($v, 'Hello.');
}
$this->assertEquals($errorCount, count($component->validate()));
@@ -477,7 +476,7 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
$vcard = new Component\VCard();
- $component = new FakeComponent($vcard,'Hi', array(), $defaults = false );
+ $component = new FakeComponent($vcard, 'Hi', [], $defaults = false);
$component->validate(Component::REPAIR);
$this->assertEquals('yow', $component->BAR->getValue());
@@ -485,18 +484,18 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
function ruleData() {
- return array(
+ return [
- array(array(), 2),
- array(array('FOO'), 3),
- array(array('BAR'), 1),
- array(array('BAZ'), 1),
- array(array('BAR','BAZ'), 0),
- array(array('BAR','BAZ','ZIM',), 0),
- array(array('BAR','BAZ','ZIM','GIR'), 0),
- array(array('BAR','BAZ','ZIM','GIR','GIR'), 1),
+ [[], 2],
+ [['FOO'], 3],
+ [['BAR'], 1],
+ [['BAZ'], 1],
+ [['BAR','BAZ'], 0],
+ [['BAR','BAZ','ZIM',], 0],
+ [['BAR','BAZ','ZIM','GIR'], 0],
+ [['BAR','BAZ','ZIM','GIR','GIR'], 1],
- );
+ ];
}
@@ -504,25 +503,24 @@ class ComponentTest extends \PHPUnit_Framework_TestCase {
class FakeComponent extends Component {
- public function getValidationRules() {
+ function getValidationRules() {
- return array(
+ return [
'FOO' => '0',
'BAR' => '1',
'BAZ' => '+',
'ZIM' => '*',
'GIR' => '?',
- );
+ ];
}
- public function getDefaults() {
+ function getDefaults() {
- return array(
+ return [
'BAR' => 'yow',
- );
+ ];
}
}
-
diff --git a/tests/VObject/DateTimeParserTest.php b/tests/VObject/DateTimeParserTest.php
index bcdb6b4..35fe23f 100644
--- a/tests/VObject/DateTimeParserTest.php
+++ b/tests/VObject/DateTimeParserTest.php
@@ -10,12 +10,12 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
function testParseICalendarDuration() {
- $this->assertEquals('+1 weeks', DateTimeParser::parseDuration('P1W',true));
- $this->assertEquals('+5 days', DateTimeParser::parseDuration('P5D',true));
- $this->assertEquals('+5 days 3 hours 50 minutes 12 seconds', DateTimeParser::parseDuration('P5DT3H50M12S',true));
- $this->assertEquals('-1 weeks 50 minutes', DateTimeParser::parseDuration('-P1WT50M',true));
- $this->assertEquals('+50 days 3 hours 2 seconds', DateTimeParser::parseDuration('+P50DT3H2S',true));
- $this->assertEquals('+0 seconds', DateTimeParser::parseDuration('+PT0S',true));
+ $this->assertEquals('+1 weeks', DateTimeParser::parseDuration('P1W', true));
+ $this->assertEquals('+5 days', DateTimeParser::parseDuration('P5D', true));
+ $this->assertEquals('+5 days 3 hours 50 minutes 12 seconds', DateTimeParser::parseDuration('P5DT3H50M12S', true));
+ $this->assertEquals('-1 weeks 50 minutes', DateTimeParser::parseDuration('-P1WT50M', true));
+ $this->assertEquals('+50 days 3 hours 2 seconds', DateTimeParser::parseDuration('+P50DT3H2S', true));
+ $this->assertEquals('+0 seconds', DateTimeParser::parseDuration('+PT0S', true));
$this->assertEquals(new DateInterval('PT0S'), DateTimeParser::parseDuration('PT0S'));
}
@@ -37,7 +37,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
*/
function testParseICalendarDurationFail() {
- DateTimeParser::parseDuration('P1X',true);
+ DateTimeParser::parseDuration('P1X', true);
}
@@ -45,7 +45,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDateTime('20100316T141405');
- $compare = new DateTimeImmutable('2010-03-16 14:14:05',new DateTimeZone('UTC'));
+ $compare = new DateTimeImmutable('2010-03-16 14:14:05', new DateTimeZone('UTC'));
$this->assertEquals($compare, $dateTime);
@@ -68,7 +68,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDateTime('20100316T141405Z');
- $compare = new DateTimeImmutable('2010-03-16 14:14:05',new DateTimeZone('UTC'));
+ $compare = new DateTimeImmutable('2010-03-16 14:14:05', new DateTimeZone('UTC'));
$this->assertEquals($compare, $dateTime);
}
@@ -80,7 +80,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDateTime('20101211T160000Z');
- $compare = new DateTimeImmutable('2010-12-11 16:00:00',new DateTimeZone('UTC'));
+ $compare = new DateTimeImmutable('2010-12-11 16:00:00', new DateTimeZone('UTC'));
$this->assertEquals($compare, $dateTime);
}
@@ -92,7 +92,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDateTime('20100316T141405', new DateTimeZone('Europe/Amsterdam'));
- $compare = new DateTimeImmutable('2010-03-16 14:14:05',new DateTimeZone('Europe/Amsterdam'));
+ $compare = new DateTimeImmutable('2010-03-16 14:14:05', new DateTimeZone('Europe/Amsterdam'));
$this->assertEquals($compare, $dateTime);
}
@@ -101,7 +101,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDate('20100316');
- $expected = new DateTimeImmutable('2010-03-16 00:00:00',new DateTimeZone('UTC'));
+ $expected = new DateTimeImmutable('2010-03-16 00:00:00', new DateTimeZone('UTC'));
$this->assertEquals($expected, $dateTime);
@@ -117,7 +117,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDate('45001231');
- $expected = new DateTimeImmutable('4500-12-31 00:00:00',new DateTimeZone('UTC'));
+ $expected = new DateTimeImmutable('4500-12-31 00:00:00', new DateTimeZone('UTC'));
$this->assertEquals($expected, $dateTime);
@@ -133,7 +133,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$dateTime = DateTimeParser::parseDateTime('45001231T235959');
- $expected = new DateTimeImmutable('4500-12-31 23:59:59',new DateTimeZone('UTC'));
+ $expected = new DateTimeImmutable('4500-12-31 23:59:59', new DateTimeZone('UTC'));
$this->assertEquals($expected, $dateTime);
@@ -190,180 +190,180 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
[
"19961022T140000",
[
- "year" => 1996,
- "month" => 10,
- "date" => 22,
- "hour" => 14,
- "minute" => 00,
- "second" => 00,
+ "year" => 1996,
+ "month" => 10,
+ "date" => 22,
+ "hour" => 14,
+ "minute" => 00,
+ "second" => 00,
"timezone" => null
],
],
[
"--1022T1400",
[
- "year" => null,
- "month" => 10,
- "date" => 22,
- "hour" => 14,
- "minute" => 00,
- "second" => null,
+ "year" => null,
+ "month" => 10,
+ "date" => 22,
+ "hour" => 14,
+ "minute" => 00,
+ "second" => null,
"timezone" => null
],
],
[
"---22T14",
[
- "year" => null,
- "month" => null,
- "date" => 22,
- "hour" => 14,
- "minute" => null,
- "second" => null,
+ "year" => null,
+ "month" => null,
+ "date" => 22,
+ "hour" => 14,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"19850412",
[
- "year" => 1985,
- "month" => 4,
- "date" => 12,
- "hour" => null,
- "minute" => null,
- "second" => null,
+ "year" => 1985,
+ "month" => 4,
+ "date" => 12,
+ "hour" => null,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"1985-04",
[
- "year" => 1985,
- "month" => 04,
- "date" => null,
- "hour" => null,
- "minute" => null,
- "second" => null,
+ "year" => 1985,
+ "month" => 04,
+ "date" => null,
+ "hour" => null,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"1985",
[
- "year" => 1985,
- "month" => null,
- "date" => null,
- "hour" => null,
- "minute" => null,
- "second" => null,
+ "year" => 1985,
+ "month" => null,
+ "date" => null,
+ "hour" => null,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"--0412",
[
- "year" => null,
- "month" => 4,
- "date" => 12,
- "hour" => null,
- "minute" => null,
- "second" => null,
+ "year" => null,
+ "month" => 4,
+ "date" => 12,
+ "hour" => null,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"---12",
[
- "year" => null,
- "month" => null,
- "date" => 12,
- "hour" => null,
- "minute" => null,
- "second" => null,
+ "year" => null,
+ "month" => null,
+ "date" => 12,
+ "hour" => null,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"T102200",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => 0,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => 10,
+ "minute" => 22,
+ "second" => 0,
"timezone" => null
],
],
[
"T1022",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => null,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => 10,
+ "minute" => 22,
+ "second" => null,
"timezone" => null
],
],
[
"T10",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => null,
- "second" => null,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => 10,
+ "minute" => null,
+ "second" => null,
"timezone" => null
],
],
[
"T-2200",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => null,
- "minute" => 22,
- "second" => 00,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => null,
+ "minute" => 22,
+ "second" => 00,
"timezone" => null
],
],
[
"T--00",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => null,
- "minute" => null,
- "second" => 00,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => null,
+ "minute" => null,
+ "second" => 00,
"timezone" => null
],
],
[
"T102200Z",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => 00,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => 10,
+ "minute" => 22,
+ "second" => 00,
"timezone" => 'Z'
],
],
[
"T102200-0800",
[
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => 00,
+ "year" => null,
+ "month" => null,
+ "date" => null,
+ "hour" => 10,
+ "minute" => 22,
+ "second" => 00,
"timezone" => '-0800'
],
],
@@ -372,12 +372,12 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
[
"2012-11-29T15:10:53Z",
[
- "year" => 2012,
- "month" => 11,
- "date" => 29,
- "hour" => 15,
- "minute" => 10,
- "second" => 53,
+ "year" => 2012,
+ "month" => 11,
+ "date" => 29,
+ "hour" => 15,
+ "minute" => 10,
+ "second" => 53,
"timezone" => 'Z'
],
],
@@ -386,12 +386,12 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
[
"20121129T151053.123Z",
[
- "year" => 2012,
- "month" => 11,
- "date" => 29,
- "hour" => 15,
- "minute" => 10,
- "second" => 53,
+ "year" => 2012,
+ "month" => 11,
+ "date" => 29,
+ "hour" => 15,
+ "minute" => 10,
+ "second" => 53,
"timezone" => 'Z'
],
],
@@ -400,12 +400,12 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
[
"2012-11-29T15:10:53.123Z",
[
- "year" => 2012,
- "month" => 11,
- "date" => 29,
- "hour" => 15,
- "minute" => 10,
- "second" => 53,
+ "year" => 2012,
+ "month" => 11,
+ "date" => 29,
+ "hour" => 15,
+ "minute" => 10,
+ "second" => 53,
"timezone" => 'Z'
],
],
@@ -418,9 +418,9 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'20150128',
[
- 'year' => '2015',
+ 'year' => '2015',
'month' => '01',
- 'date' => '28'
+ 'date' => '28'
]
);
@@ -431,7 +431,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'2015-01',
[
- 'year' => '2015',
+ 'year' => '2015',
'month' => '01'
]
);
@@ -455,7 +455,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
'--0128',
[
'month' => '01',
- 'date' => '28'
+ 'date' => '28'
]
);
@@ -488,7 +488,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'1353',
[
- 'hour' => '13',
+ 'hour' => '13',
'minute' => '53'
]
);
@@ -500,7 +500,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'135301',
[
- 'hour' => '13',
+ 'hour' => '13',
'minute' => '53',
'second' => '01'
]
@@ -539,14 +539,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
/**
* This is unreachable due to a conflict between date and time pattern.
* This is an error in the specification, not in our implementation.
- $this->assertDateAndOrTimeEqualsTo(
- '--01',
- [
- 'second' => '01'
- ]
- );
*/
-
}
function testDateAndOrTime_TimeWithSecondZ() {
@@ -554,7 +547,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'--01Z',
[
- 'second' => '01',
+ 'second' => '01',
'timezone' => 'Z'
]
);
@@ -566,7 +559,7 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'--01+1234',
[
- 'second' => '01',
+ 'second' => '01',
'timezone' => '+1234'
]
);
@@ -578,10 +571,10 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'20150128T13',
[
- 'year' => '2015',
+ 'year' => '2015',
'month' => '01',
- 'date' => '28',
- 'hour' => '13'
+ 'date' => '28',
+ 'hour' => '13'
]
);
@@ -593,8 +586,8 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
'--0128T13',
[
'month' => '01',
- 'date' => '28',
- 'hour' => '13'
+ 'date' => '28',
+ 'hour' => '13'
]
);
@@ -617,8 +610,8 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'---28T1353',
[
- 'date' => '28',
- 'hour' => '13',
+ 'date' => '28',
+ 'hour' => '13',
'minute' => '53'
]
);
@@ -630,8 +623,8 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'---28T135301',
[
- 'date' => '28',
- 'hour' => '13',
+ 'date' => '28',
+ 'hour' => '13',
'minute' => '53',
'second' => '01'
]
@@ -644,8 +637,8 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'---28T13Z',
[
- 'date' => '28',
- 'hour' => '13',
+ 'date' => '28',
+ 'hour' => '13',
'timezone' => 'Z'
]
);
@@ -657,8 +650,8 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
$this->assertDateAndOrTimeEqualsTo(
'---28T13+1234',
[
- 'date' => '28',
- 'hour' => '13',
+ 'date' => '28',
+ 'hour' => '13',
'timezone' => '+1234'
]
);
@@ -671,12 +664,12 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
DateTimeParser::parseVCardDateAndOrTime($date),
array_merge(
[
- 'year' => null,
- 'month' => null,
- 'date' => null,
- 'hour' => null,
- 'minute' => null,
- 'second' => null,
+ 'year' => null,
+ 'month' => null,
+ 'date' => null,
+ 'hour' => null,
+ 'minute' => null,
+ 'second' => null,
'timezone' => null
],
$parts
diff --git a/tests/VObject/DocumentTest.php b/tests/VObject/DocumentTest.php
index d019b39..5d66ce4 100644
--- a/tests/VObject/DocumentTest.php
+++ b/tests/VObject/DocumentTest.php
@@ -20,14 +20,14 @@ class DocumentTest extends \PHPUnit_Framework_TestCase {
function testCreateComponent() {
- $vcal = new Component\VCalendar(array(), false);
+ $vcal = new Component\VCalendar([], false);
$event = $vcal->createComponent('VEVENT');
$this->assertInstanceOf('Sabre\VObject\Component\VEvent', $event);
$vcal->add($event);
- $prop = $vcal->createProperty('X-PROP','1234256',array('X-PARAM' => '3'));
+ $prop = $vcal->createProperty('X-PROP', '1234256', ['X-PARAM' => '3']);
$this->assertInstanceOf('Sabre\VObject\Property', $prop);
$event->add($prop);
@@ -44,7 +44,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase {
function testCreate() {
- $vcal = new Component\VCalendar(array(), false);
+ $vcal = new Component\VCalendar([], false);
$event = $vcal->create('VEVENT');
$this->assertInstanceOf('Sabre\VObject\Component\VEvent', $event);
@@ -56,7 +56,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase {
function testGetClassNameForPropertyValue() {
- $vcal = new Component\VCalendar(array(), false);
+ $vcal = new Component\VCalendar([], false);
$this->assertEquals('Sabre\\VObject\\Property\\Text', $vcal->getClassNameForPropertyValue('TEXT'));
$this->assertNull($vcal->getClassNameForPropertyValue('FOO'));
diff --git a/tests/VObject/ElementListTest.php b/tests/VObject/ElementListTest.php
index 48cea36..e632311 100644
--- a/tests/VObject/ElementListTest.php
+++ b/tests/VObject/ElementListTest.php
@@ -9,23 +9,23 @@ class ElementListTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
$sub = $cal->createComponent('VEVENT');
- $elems = array(
+ $elems = [
$sub,
clone $sub,
clone $sub
- );
+ ];
$elemList = new ElementList($elems);
$count = 0;
- foreach($elemList as $key=>$subcomponent) {
+ foreach ($elemList as $key => $subcomponent) {
$count++;
- $this->assertInstanceOf('Sabre\\VObject\\Component',$subcomponent);
+ $this->assertInstanceOf('Sabre\\VObject\\Component', $subcomponent);
}
- $this->assertEquals(3,$count);
- $this->assertEquals(2,$key);
+ $this->assertEquals(3, $count);
+ $this->assertEquals(2, $key);
}
diff --git a/tests/VObject/EmClientTest.php b/tests/VObject/EmClientTest.php
index 2c72d23..5743d48 100644
--- a/tests/VObject/EmClientTest.php
+++ b/tests/VObject/EmClientTest.php
@@ -54,4 +54,3 @@ END:VCALENDAR';
}
}
-
diff --git a/tests/VObject/EmptyParameterTest.php b/tests/VObject/EmptyParameterTest.php
index 0dc1d69..a9e9fcc 100644
--- a/tests/VObject/EmptyParameterTest.php
+++ b/tests/VObject/EmptyParameterTest.php
@@ -2,7 +2,7 @@
namespace Sabre\VObject;
-class IssueEmptyParameterTest extends \PHPUnit_Framework_TestCase {
+class EmptyParameterTest extends \PHPUnit_Framework_TestCase {
function testRead() {
@@ -41,27 +41,27 @@ END:VCARD
VCF;
- $this->assertEquals($expected, str_replace("\r","", $vcard));
+ $this->assertEquals($expected, str_replace("\r", "", $vcard));
}
function testVCard21Parameter() {
- $vcard = new Component\VCard(array(), false);
+ $vcard = new Component\VCard([], false);
$vcard->VERSION = '2.1';
$vcard->PHOTO = 'random_stuff';
- $vcard->PHOTO->add(null,'BASE64');
+ $vcard->PHOTO->add(null, 'BASE64');
$vcard->UID = 'foo-bar';
$result = $vcard->serialize();
- $expected = array(
+ $expected = [
"BEGIN:VCARD",
"VERSION:2.1",
"PHOTO;BASE64:" . base64_encode('random_stuff'),
"UID:foo-bar",
"END:VCARD",
"",
- );
+ ];
$this->assertEquals(implode("\r\n", $expected), $result);
diff --git a/tests/VObject/EmptyValueIssueTest.php b/tests/VObject/EmptyValueIssueTest.php
index 1f993ea..7a34944 100644
--- a/tests/VObject/EmptyValueIssueTest.php
+++ b/tests/VObject/EmptyValueIssueTest.php
@@ -5,7 +5,7 @@ namespace Sabre\VObject;
/**
* This test is written for Issue 68:
*
- * https://github.com/fruux/sabre-vobject/issues/68
+ * https://github.com/fruux/sabre-vobject/issues/68
*/
class EmptyValueIssueTest extends \PHPUnit_Framework_TestCase {
@@ -28,4 +28,3 @@ ICS;
}
}
-
diff --git a/tests/VObject/FreeBusyGeneratorTest.php b/tests/VObject/FreeBusyGeneratorTest.php
index d01ef3a..a7977e8 100644
--- a/tests/VObject/FreeBusyGeneratorTest.php
+++ b/tests/VObject/FreeBusyGeneratorTest.php
@@ -6,7 +6,7 @@ class FreeBusyGeneratorTest extends \PHPUnit_Framework_TestCase {
function getInput() {
- $tests = array();
+ $tests = [];
$blob = <<<ICS
BEGIN:VCALENDAR
@@ -18,10 +18,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
"20110101T120000Z/20110101T130000Z"
- );
+ ];
// opaque, shows up
$blob = <<<ICS
@@ -35,10 +35,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
"20110101T130000Z/20110101T140000Z"
- );
+ ];
// transparent, hidden
$blob = <<<ICS
@@ -52,10 +52,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
null,
- );
+ ];
// cancelled, hidden
$blob = <<<ICS
@@ -69,10 +69,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
null,
- );
+ ];
// tentative, shows up
$blob = <<<ICS
@@ -86,10 +86,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
'20110101T180000Z/20110101T190000Z',
- );
+ ];
// outside of time-range, hidden
$blob = <<<ICS
@@ -102,10 +102,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
null,
- );
+ ];
// outside of time-range, hidden
$blob = <<<ICS
@@ -118,10 +118,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
null,
- );
+ ];
// using duration, shows up
$blob = <<<ICS
@@ -134,10 +134,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
'20110101T190000Z/20110101T200000Z',
- );
+ ];
// Day-long event, shows up
$blob = <<<ICS
@@ -149,10 +149,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
'20110102T000000Z/20110103T000000Z',
- );
+ ];
// No duration, does not show up
@@ -165,10 +165,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
null,
- );
+ ];
// encoded as object, shows up
$blob = <<<ICS
@@ -181,10 +181,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
Reader::read($blob),
'20110101T210000Z/20110101T220000Z',
- );
+ ];
// Freebusy. Some parts show up
$blob = <<<ICS
@@ -199,15 +199,15 @@ END:VFREEBUSY
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
Reader::read($blob),
- array(
+ [
'20110103T010000Z/20110103T020000Z',
'20110103T030000Z/20110103T040000Z',
'20110103T040000Z/20110103T050000Z',
'20110103T050000Z/20110103T060000Z',
- )
- );
+ ]
+ ];
// Yearly recurrence rule, shows up
@@ -222,10 +222,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
Reader::read($blob),
'20110101T220000Z/20110101T230000Z',
- );
+ ];
// Yearly recurrence rule + duration, shows up
@@ -240,10 +240,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
Reader::read($blob),
'20110101T230000Z/20110102T000000Z',
- );
+ ];
// Floating time, no timezone
$blob = <<<ICS
@@ -256,10 +256,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
"20110101T120000Z/20110101T130000Z"
- );
+ ];
// Floating time + reference timezone
$blob = <<<ICS
@@ -272,11 +272,11 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
"20110101T170000Z/20110101T180000Z",
new \DateTimeZone('America/Toronto')
- );
+ ];
// All-day event
$blob = <<<ICS
@@ -288,10 +288,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
"20110101T000000Z/20110102T000000Z"
- );
+ ];
// All-day event + reference timezone
$blob = <<<ICS
@@ -303,11 +303,11 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
"20110101T050000Z/20110102T050000Z",
new \DateTimeZone('America/Toronto')
- );
+ ];
// Recurrence rule with no valid instances
$blob = <<<ICS
@@ -322,10 +322,10 @@ END:VEVENT
END:VCALENDAR
ICS;
- $tests[] = array(
+ $tests[] = [
$blob,
- array()
- );
+ []
+ ];
return $tests;
}
@@ -348,7 +348,7 @@ ICS;
$freebusy = $result->VFREEBUSY->select('FREEBUSY');
- foreach($freebusy as $fb) {
+ foreach ($freebusy as $fb) {
$this->assertContains((string)$fb, $expected, "$fb did not appear in our list of expected freebusy strings. This is concerning!");
@@ -358,7 +358,7 @@ ICS;
}
$this->assertTrue(
count($expected) === 0,
- 'There were elements in the expected array that were not found in the output: ' . "\n" . print_r($expected,true) . "\n" . $result->serialize()
+ 'There were elements in the expected array that were not found in the output: ' . "\n" . print_r($expected, true) . "\n" . $result->serialize()
);
}
@@ -369,7 +369,7 @@ ICS;
$obj->METHOD = 'PUBLISH';
$gen = new FreeBusyGenerator();
- $gen->setObjects(array());
+ $gen->setObjects([]);
$gen->setBaseObject($obj);
$result = $gen->getResult();
diff --git a/tests/VObject/GoogleColonEscapingTest.php b/tests/VObject/GoogleColonEscapingTest.php
index 0961ec1..ee37aa8 100644
--- a/tests/VObject/GoogleColonEscapingTest.php
+++ b/tests/VObject/GoogleColonEscapingTest.php
@@ -8,7 +8,7 @@ namespace Sabre\VObject;
* VObject will provide a workaround for this, so end-user still get expected
* values.
*/
-class GoogleColonEscaping extends \PHPUnit_Framework_TestCase {
+class GoogleColonEscapingTest extends \PHPUnit_Framework_TestCase {
function testDecode() {
diff --git a/tests/VObject/ITip/BrokerAttendeeReplyTest.php b/tests/VObject/ITip/BrokerAttendeeReplyTest.php
index 6fb0367..57d01f4 100644
--- a/tests/VObject/ITip/BrokerAttendeeReplyTest.php
+++ b/tests/VObject/ITip/BrokerAttendeeReplyTest.php
@@ -37,16 +37,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -63,9 +63,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -145,16 +145,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -208,9 +208,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -288,16 +288,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -346,9 +346,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -384,7 +384,7 @@ END:VCALENDAR
ICS;
- $expected = array();
+ $expected = [];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -419,16 +419,16 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -443,9 +443,9 @@ ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=One:mailto:one at example.org
END:VEVENT
END:VCALENDAR
ICS
- )
+ ]
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -479,7 +479,7 @@ END:VEVENT
END:VCALENDAR
ICS;
- $expected = array();
+ $expected = [];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -525,16 +525,16 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => null,
- 'recipient' => 'mailto:organizer at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => null,
+ 'recipient' => 'mailto:organizer at example.org',
'recipientName' => null,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -551,8 +551,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -596,16 +596,16 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => null,
- 'recipient' => 'mailto:organizer at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => null,
+ 'recipient' => 'mailto:organizer at example.org',
'recipientName' => null,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -622,8 +622,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -666,16 +666,16 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => null,
- 'recipient' => 'mailto:organizer at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => null,
+ 'recipient' => 'mailto:organizer at example.org',
'recipientName' => null,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -693,8 +693,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -730,16 +730,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -755,9 +755,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -796,7 +796,7 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array();
+ $expected = [];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -853,7 +853,7 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array();
+ $expected = [];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -890,7 +890,7 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array();
+ $expected = [];
$result = $this->parse($oldMessage, $newMessage, $expected);
}
@@ -926,16 +926,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -951,9 +951,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -1001,16 +1001,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
@@ -1027,9 +1027,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
@@ -1093,16 +1093,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
@@ -1120,9 +1120,9 @@ END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected);
diff --git a/tests/VObject/ITip/BrokerDeleteEventTest.php b/tests/VObject/ITip/BrokerDeleteEventTest.php
index 183f840..55a8d80 100644
--- a/tests/VObject/ITip/BrokerDeleteEventTest.php
+++ b/tests/VObject/ITip/BrokerDeleteEventTest.php
@@ -26,16 +26,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
'recipientName' => 'One',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -51,17 +51,17 @@ ATTENDEE;CN=One:mailto:one at example.org
END:VEVENT
END:VCALENDAR
ICS
- ),
-
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two at example.org',
+ ],
+
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:two at example.org',
'recipientName' => 'Two',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -78,8 +78,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -107,16 +107,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one at example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REPLY',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:one at example.org',
+ 'senderName' => 'One',
+ 'recipient' => 'mailto:strunk at example.org',
'recipientName' => 'Strunk',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -132,8 +132,8 @@ ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one at example.org
END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:one at example.org');
@@ -162,7 +162,7 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array();
+ $expected = [];
$result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:one at example.org');
@@ -171,7 +171,7 @@ ICS;
function testNoCalendar() {
- $this->parse(null, null, array(), 'mailto:one at example.org');
+ $this->parse(null, null, [], 'mailto:one at example.org');
}
@@ -186,7 +186,7 @@ SEQUENCE:1
END:VTODO
END:VCALENDAR
ICS;
- $this->parse($oldMessage, null, array(), 'mailto:one at example.org');
+ $this->parse($oldMessage, null, [], 'mailto:one at example.org');
}
diff --git a/tests/VObject/ITip/BrokerNewEventTest.php b/tests/VObject/ITip/BrokerNewEventTest.php
index f4853c5..49d8c09 100644
--- a/tests/VObject/ITip/BrokerNewEventTest.php
+++ b/tests/VObject/ITip/BrokerNewEventTest.php
@@ -63,18 +63,18 @@ END:VEVENT
END:VCALENDAR
ICS;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:white at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:white at example.org',
'recipientName' => 'White',
- 'message' => $expectedMessage,
- ),
- );
+ 'message' => $expectedMessage,
+ ],
+ ];
$result = $this->parse($message, $expected);
@@ -101,8 +101,8 @@ END:VEVENT
END:VCALENDAR
ICS;
- $expected = array();
- $this->parse($message, array());
+ $expected = [];
+ $this->parse($message, []);
}
/**
@@ -126,8 +126,8 @@ END:VEVENT
END:VCALENDAR
ICS;
- $expected = array();
- $this->parse($message, array());
+ $expected = [];
+ $this->parse($message, []);
}
@@ -158,16 +158,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
'recipientName' => 'One',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -185,16 +185,16 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two at example.org',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:two at example.org',
'recipientName' => 'Two',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -220,16 +220,16 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three at example.org',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:three at example.org',
'recipientName' => 'Three',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -246,8 +246,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($message, $expected);
@@ -281,16 +281,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
'recipientName' => 'One',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -308,16 +308,16 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two at example.org',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:two at example.org',
'recipientName' => 'Two',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -342,16 +342,16 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three at example.org',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:three at example.org',
'recipientName' => 'Three',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -368,8 +368,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($message, $expected);
@@ -391,7 +391,7 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array();
+ $expected = [];
$result = $this->parse($message, $expected);
}
@@ -424,13 +424,12 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $result = $this->parse($message, array());
+ $result = $this->parse($message, []);
}
/**
* @expectedException Sabre\VObject\ITip\SameOrganizerForAllComponentsException
- *
*/
function testChangingOrganizers() {
@@ -457,7 +456,7 @@ END:VCALENDAR
ICS;
$version = \Sabre\VObject\Version::VERSION;
- $result = $this->parse($message, array());
+ $result = $this->parse($message, []);
}
function testNoOrganizerHasAttendee() {
@@ -472,24 +471,24 @@ END:VEVENT
END:VCALENDAR
ICS;
- $this->parse($message, array());
+ $this->parse($message, []);
}
- function parse($message, $expected = array()) {
+ function parse($message, $expected = []) {
$broker = new Broker();
$result = $broker->parseEvent($message, 'mailto:strunk at example.org');
$this->assertEquals(count($expected), count($result));
- foreach($expected as $index=>$ex) {
+ foreach ($expected as $index => $ex) {
$message = $result[$index];
- foreach($ex as $key=>$val) {
+ foreach ($ex as $key => $val) {
- if ($key==='message') {
+ if ($key === 'message') {
$this->assertEquals(
str_replace("\n", "\r\n", $val),
rtrim($message->message->serialize(), "\r\n")
diff --git a/tests/VObject/ITip/BrokerTester.php b/tests/VObject/ITip/BrokerTester.php
index b9b26cf..395e184 100644
--- a/tests/VObject/ITip/BrokerTester.php
+++ b/tests/VObject/ITip/BrokerTester.php
@@ -6,27 +6,27 @@ use Sabre\VObject\Reader;
/**
* Utilities for testing the broker
- *
+ *
* @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
+ * @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
abstract class BrokerTester extends \Sabre\VObject\TestCase {
- function parse($oldMessage, $newMessage, $expected = array(), $currentUser = 'mailto:one at example.org') {
+ function parse($oldMessage, $newMessage, $expected = [], $currentUser = 'mailto:one at example.org') {
$broker = new Broker();
$result = $broker->parseEvent($newMessage, $currentUser, $oldMessage);
$this->assertEquals(count($expected), count($result));
- foreach($expected as $index=>$ex) {
+ foreach ($expected as $index => $ex) {
$message = $result[$index];
- foreach($ex as $key=>$val) {
+ foreach ($ex as $key => $val) {
- if ($key==='message') {
+ if ($key === 'message') {
$this->assertVObjEquals(
$val,
$message->message->serialize()
@@ -47,23 +47,23 @@ abstract class BrokerTester extends \Sabre\VObject\TestCase {
$vcal = Reader::read($input);
- foreach($vcal->getComponents() as $mainComponent) {
+ foreach ($vcal->getComponents() as $mainComponent) {
break;
}
$message = new Message();
$message->message = $vcal;
- $message->method = isset($vcal->METHOD)?$vcal->METHOD->getValue():null;
+ $message->method = isset($vcal->METHOD) ? $vcal->METHOD->getValue() : null;
$message->component = $mainComponent->name;
$message->uid = $mainComponent->uid->getValue();
- $message->sequence = isset($vcal->VEVENT[0])?(string)$vcal->VEVENT[0]->SEQUENCE:null;
+ $message->sequence = isset($vcal->VEVENT[0]) ? (string)$vcal->VEVENT[0]->SEQUENCE : null;
if ($message->method === 'REPLY') {
$message->sender = $mainComponent->ATTENDEE->getValue();
- $message->senderName = isset($mainComponent->ATTENDEE['CN'])?$mainComponent->ATTENDEE['CN']->getValue():null;
+ $message->senderName = isset($mainComponent->ATTENDEE['CN']) ? $mainComponent->ATTENDEE['CN']->getValue() : null;
$message->recipient = $mainComponent->ORGANIZER->getValue();
- $message->recipientName = isset($mainComponent->ORGANIZER['CN'])?$mainComponent->ORGANIZER['CN']:null;
+ $message->recipientName = isset($mainComponent->ORGANIZER['CN']) ? $mainComponent->ORGANIZER['CN'] : null;
}
@@ -91,7 +91,7 @@ abstract class BrokerTester extends \Sabre\VObject\TestCase {
}
if ($result instanceof \Sabre\VObject\Component\VCalendar) {
$result = $result->serialize();
- $result = rtrim($result,"\r\n");
+ $result = rtrim($result, "\r\n");
}
$this->assertEquals(
diff --git a/tests/VObject/ITip/BrokerUpdateEventTest.php b/tests/VObject/ITip/BrokerUpdateEventTest.php
index 3ba6a11..c3a0763 100644
--- a/tests/VObject/ITip/BrokerUpdateEventTest.php
+++ b/tests/VObject/ITip/BrokerUpdateEventTest.php
@@ -2,7 +2,7 @@
namespace Sabre\VObject\ITip;
-class BrokerUpdateTest extends BrokerTester {
+class BrokerUpdateEventTest extends BrokerTester {
function testInviteChange() {
@@ -41,17 +41,17 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
- 'recipientName' => 'One',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
+ 'recipientName' => 'One',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -68,17 +68,17 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two at example.org',
- 'recipientName' => 'Two',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:two at example.org',
+ 'recipientName' => 'Two',
'significantChange' => false,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -97,17 +97,17 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three at example.org',
- 'recipientName' => 'Three',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:three at example.org',
+ 'recipientName' => 'Three',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -126,8 +126,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -162,16 +162,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
'recipientName' => 'One',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -187,9 +187,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -224,12 +224,12 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
'component' => 'VEVENT',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -245,9 +245,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -280,7 +280,7 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array();
+ $expected = [];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
}
@@ -319,16 +319,16 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
'recipientName' => 'One',
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -346,8 +346,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -396,17 +396,17 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
- 'recipientName' => 'One',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
+ 'recipientName' => 'One',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -422,17 +422,17 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two at example.org',
- 'recipientName' => 'Two',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:two at example.org',
+ 'recipientName' => 'Two',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -451,17 +451,17 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three at example.org',
- 'recipientName' => 'Three',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:three at example.org',
+ 'recipientName' => 'Three',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -480,8 +480,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -520,17 +520,17 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
- 'recipientName' => 'One',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
+ 'recipientName' => 'One',
'significantChange' => false,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -547,9 +547,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -588,17 +588,17 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
- 'recipientName' => 'One',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
+ 'recipientName' => 'One',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -615,9 +615,9 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
+ ],
- );
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -656,17 +656,17 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
- 'recipientName' => 'One',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
+ 'recipientName' => 'One',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -683,17 +683,17 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- array(
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two at example.org',
- 'recipientName' => 'Two',
+ ],
+ [
+ 'uid' => 'foobar',
+ 'method' => 'CANCEL',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:two at example.org',
+ 'recipientName' => 'Two',
'significantChange' => true,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -710,8 +710,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
@@ -768,17 +768,17 @@ ICS;
$version = \Sabre\VObject\Version::VERSION;
- $expected = array(
- array(
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk at example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one at example.org',
- 'recipientName' => 'One',
+ $expected = [
+ [
+ 'uid' => 'foobar',
+ 'method' => 'REQUEST',
+ 'component' => 'VEVENT',
+ 'sender' => 'mailto:strunk at example.org',
+ 'senderName' => 'Strunk',
+ 'recipient' => 'mailto:one at example.org',
+ 'recipientName' => 'One',
'significantChange' => false,
- 'message' => <<<ICS
+ 'message' => <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Sabre//Sabre VObject $version//EN
@@ -801,8 +801,8 @@ END:VEVENT
END:VCALENDAR
ICS
- ),
- );
+ ],
+ ];
$this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk at example.org');
diff --git a/tests/VObject/ITip/EvolutionTest.php b/tests/VObject/ITip/EvolutionTest.php
index 76c47ca..3afe560 100644
--- a/tests/VObject/ITip/EvolutionTest.php
+++ b/tests/VObject/ITip/EvolutionTest.php
@@ -866,7 +866,7 @@ END:VEVENT
END:VCALENDAR
ICS;
- $version = \Sabre\VObject\Version::VERSION;
+ $version = \Sabre\VObject\Version::VERSION;
$expectedICS = <<<ICS
BEGIN:VCALENDAR
VERSION:2.0
@@ -1723,17 +1723,17 @@ END:VEVENT
END:VCALENDAR
ICS;
- $expected = array(
- array(
- 'uid' => '20140813T153116Z-12176-1000-1065-6 at johnny-lubuntu',
- 'method' => 'REQUEST',
- 'sender' => 'mailto:martin at fruux.com',
- 'senderName' => null,
- 'recipient' => 'mailto:dominik at fruux.com',
+ $expected = [
+ [
+ 'uid' => '20140813T153116Z-12176-1000-1065-6 at johnny-lubuntu',
+ 'method' => 'REQUEST',
+ 'sender' => 'mailto:martin at fruux.com',
+ 'senderName' => null,
+ 'recipient' => 'mailto:dominik at fruux.com',
'recipientName' => null,
- 'message' => $expectedICS,
- )
- );
+ 'message' => $expectedICS,
+ ]
+ ];
$this->parse(null, $ics, $expected, 'mailto:martin at fruux.com');
}
@@ -1743,7 +1743,7 @@ ICS;
* again mangled by iCal. This triggered a few bugs related to email
* address scheme casing.
*/
- public function testAttendeeModify() {
+ function testAttendeeModify() {
$old = <<<ICS
BEGIN:VCALENDAR
@@ -2644,7 +2644,7 @@ END:VEVENT
END:VCALENDAR
ICS;
- $this->parse($old, $new, array(), 'mailto:a1 at example.org');
+ $this->parse($old, $new, [], 'mailto:a1 at example.org');
}
diff --git a/tests/VObject/ITip/MessageTest.php b/tests/VObject/ITip/MessageTest.php
index 735d9e9..0fed7eb 100644
--- a/tests/VObject/ITip/MessageTest.php
+++ b/tests/VObject/ITip/MessageTest.php
@@ -4,14 +4,14 @@ namespace Sabre\VObject\ITip;
class MessageTest extends \PHPUnit_Framework_TestCase {
- public function testNoScheduleStatus() {
+ function testNoScheduleStatus() {
$message = new Message();
$this->assertFalse($message->getScheduleStatus());
}
- public function testScheduleStatus() {
+ function testScheduleStatus() {
$message = new Message();
$message->scheduleStatus = '1.2;Delivered';
@@ -20,7 +20,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase {
}
- public function testUnexpectedScheduleStatus() {
+ function testUnexpectedScheduleStatus() {
$message = new Message();
$message->scheduleStatus = '9.9.9';
diff --git a/tests/VObject/Issue26Test.php b/tests/VObject/Issue26Test.php
index f080f39..6dda212 100644
--- a/tests/VObject/Issue26Test.php
+++ b/tests/VObject/Issue26Test.php
@@ -2,10 +2,6 @@
namespace Sabre\VObject;
-use
- DateTime,
- DateTimeZone;
-
class Issue26Test extends \PHPUnit_Framework_TestCase {
/**
diff --git a/tests/VObject/Issue36WorkAroundTest.php b/tests/VObject/Issue36WorkAroundTest.php
index cc98716..9a9ce86 100644
--- a/tests/VObject/Issue36WorkAroundTest.php
+++ b/tests/VObject/Issue36WorkAroundTest.php
@@ -31,7 +31,7 @@ ICS;
$obj = Reader::read($event);
// If this does not throw an exception, it's all good.
- $it = new Recur\EventIterator($obj,'1833bd44-188b-405c-9f85-1a12105318aa');
+ $it = new Recur\EventIterator($obj, '1833bd44-188b-405c-9f85-1a12105318aa');
$this->assertInstanceOf('Sabre\\VObject\\Recur\EventIterator', $it);
}
diff --git a/tests/VObject/Issue40Test.php b/tests/VObject/Issue40Test.php
index 92f04ff..c5f61b0 100644
--- a/tests/VObject/Issue40Test.php
+++ b/tests/VObject/Issue40Test.php
@@ -12,16 +12,16 @@ class Issue40Test extends \PHPUnit_Framework_TestCase {
function testEncode() {
$card = new Component\VCard();
- $card->add('N', array('van der Harten', array('Rene','J.'), "", 'Sir','R.D.O.N.'), array('SORT-AS' => array('Harten','Rene')));
+ $card->add('N', ['van der Harten', ['Rene', 'J.'], "", 'Sir', 'R.D.O.N.'], ['SORT-AS' => ['Harten', 'Rene']]);
- $expected = implode("\r\n", array(
+ $expected = implode("\r\n", [
"BEGIN:VCARD",
"VERSION:3.0",
"PRODID:-//Sabre//Sabre VObject " . Version::VERSION . '//EN',
"N;SORT-AS=Harten,Rene:van der Harten;Rene,J.;;Sir;R.D.O.N.",
"END:VCARD",
""
- ));
+ ]);
$this->assertEquals($expected, $card->serialize());
diff --git a/tests/VObject/JCalTest.php b/tests/VObject/JCalTest.php
index 7a041c5..0aea9ee 100644
--- a/tests/VObject/JCalTest.php
+++ b/tests/VObject/JCalTest.php
@@ -8,140 +8,140 @@ class JCalTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
- $event = $cal->add('VEVENT', array(
- "UID" => "foo",
- "DTSTART" => new \DateTime("2013-05-26 18:10:00Z"),
- "DURATION" => "P1D",
- "CATEGORIES" => array('home', 'testing'),
- "CREATED" => new \DateTime("2013-05-26 18:10:00Z"),
+ $event = $cal->add('VEVENT', [
+ "UID" => "foo",
+ "DTSTART" => new \DateTime("2013-05-26 18:10:00Z"),
+ "DURATION" => "P1D",
+ "CATEGORIES" => ['home', 'testing'],
+ "CREATED" => new \DateTime("2013-05-26 18:10:00Z"),
- "ATTENDEE" => "mailto:armin at example.org",
- "GEO" => array(51.96668, 7.61876),
- "SEQUENCE" => 5,
- "FREEBUSY" => array("20130526T210213Z/PT1H", "20130626T120000Z/20130626T130000Z"),
- "URL" => "http://example.org/",
+ "ATTENDEE" => "mailto:armin at example.org",
+ "GEO" => [51.96668, 7.61876],
+ "SEQUENCE" => 5,
+ "FREEBUSY" => ["20130526T210213Z/PT1H", "20130626T120000Z/20130626T130000Z"],
+ "URL" => "http://example.org/",
"TZOFFSETFROM" => "+0500",
- "RRULE" => array('FREQ' => 'WEEKLY', 'BYDAY' => array('MO','TU')),
- ));
+ "RRULE" => ['FREQ' => 'WEEKLY', 'BYDAY' => ['MO', 'TU']],
+ ]);
// Modifying DTSTART to be a date-only.
$event->dtstart['VALUE'] = 'DATE';
- $event->add("X-BOOL", true, array('VALUE' => 'BOOLEAN'));
- $event->add("X-TIME", "08:00:00", array('VALUE' => 'TIME'));
- $event->add("ATTACH", "attachment", array('VALUE' => 'BINARY'));
- $event->add("ATTENDEE", "mailto:dominik at example.org", array("CN" => "Dominik", "PARTSTAT" => "DECLINED"));
+ $event->add("X-BOOL", true, ['VALUE' => 'BOOLEAN']);
+ $event->add("X-TIME", "08:00:00", ['VALUE' => 'TIME']);
+ $event->add("ATTACH", "attachment", ['VALUE' => 'BINARY']);
+ $event->add("ATTENDEE", "mailto:dominik at example.org", ["CN" => "Dominik", "PARTSTAT" => "DECLINED"]);
- $event->add('REQUEST-STATUS', array("2.0", "Success"));
- $event->add('REQUEST-STATUS', array("3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith at example.org"));
+ $event->add('REQUEST-STATUS', ["2.0", "Success"]);
+ $event->add('REQUEST-STATUS', ["3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith at example.org"]);
$event->add('DTEND', '20150108T133000');
- $expected = array(
+ $expected = [
"vcalendar",
- array(
- array(
+ [
+ [
"version",
new \StdClass(),
"text",
"2.0"
- ),
- array(
+ ],
+ [
"prodid",
new \StdClass(),
"text",
"-//Sabre//Sabre VObject " . Version::VERSION . "//EN",
- ),
- array(
+ ],
+ [
"calscale",
new \StdClass(),
"text",
"GREGORIAN"
- ),
- ),
- array(
- array("vevent",
- array(
- array(
+ ],
+ ],
+ [
+ ["vevent",
+ [
+ [
"uid", new \StdClass(), "text", "foo",
- ),
- array(
+ ],
+ [
"dtstart", new \StdClass(), "date", "2013-05-26",
- ),
- array(
+ ],
+ [
"duration", new \StdClass(), "duration", "P1D",
- ),
- array(
+ ],
+ [
"categories", new \StdClass(), "text", "home", "testing",
- ),
- array(
+ ],
+ [
"created", new \StdClass(), "date-time", "2013-05-26T18:10:00Z",
- ),
+ ],
- array(
+ [
"attendee", new \StdClass(), "cal-address", "mailto:armin at example.org",
- ),
- array(
- "geo", new \StdClass(), "float", array(51.96668, 7.61876),
- ),
- array(
+ ],
+ [
+ "geo", new \StdClass(), "float", [51.96668, 7.61876],
+ ],
+ [
"sequence", new \StdClass(), "integer", 5
- ),
- array(
- "freebusy", new \StdClass(), "period", array("2013-05-26T21:02:13", "PT1H"), array("2013-06-26T12:00:00", "2013-06-26T13:00:00"),
- ),
- array(
+ ],
+ [
+ "freebusy", new \StdClass(), "period", ["2013-05-26T21:02:13", "PT1H"], ["2013-06-26T12:00:00", "2013-06-26T13:00:00"],
+ ],
+ [
"url", new \StdClass(), "uri", "http://example.org/",
- ),
- array(
+ ],
+ [
"tzoffsetfrom", new \StdClass(), "utc-offset", "+05:00",
- ),
- array(
- "rrule", new \StdClass(), "recur", array(
- 'freq' => 'WEEKLY',
- 'byday' => array('MO', 'TU'),
- ),
- ),
- array(
+ ],
+ [
+ "rrule", new \StdClass(), "recur", [
+ 'freq' => 'WEEKLY',
+ 'byday' => ['MO', 'TU'],
+ ],
+ ],
+ [
"x-bool", new \StdClass(), "boolean", true
- ),
- array(
+ ],
+ [
"x-time", new \StdClass(), "time", "08:00:00",
- ),
- array(
+ ],
+ [
"attach", new \StdClass(), "binary", base64_encode('attachment')
- ),
- array(
+ ],
+ [
"attendee",
- (object)array(
- "cn" => "Dominik",
+ (object)[
+ "cn" => "Dominik",
"partstat" => "DECLINED",
- ),
+ ],
"cal-address",
"mailto:dominik at example.org"
- ),
- array(
+ ],
+ [
"request-status",
new \StdClass(),
"text",
- array("2.0", "Success"),
- ),
- array(
+ ["2.0", "Success"],
+ ],
+ [
"request-status",
new \StdClass(),
"text",
- array("3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith at example.org"),
- ),
- array(
+ ["3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith at example.org"],
+ ],
+ [
'dtend',
new \StdClass(),
"date-time",
"2015-01-08T13:30:00",
- ),
- ),
- array(),
- )
- ),
- );
+ ],
+ ],
+ [],
+ ]
+ ],
+ ];
$this->assertEquals($expected, $cal->jsonSerialize());
diff --git a/tests/VObject/JCardTest.php b/tests/VObject/JCardTest.php
index 0a2e977..86dc61e 100644
--- a/tests/VObject/JCardTest.php
+++ b/tests/VObject/JCardTest.php
@@ -6,187 +6,187 @@ class JCardTest extends \PHPUnit_Framework_TestCase {
function testToJCard() {
- $card = new Component\VCard(array(
- "VERSION" => "4.0",
- "UID" => "foo",
- "BDAY" => "19850407",
- "REV" => "19951031T222710Z",
- "LANG" => "nl",
- "N" => array("Last", "First", "Middle", "", ""),
- "item1.TEL" => "+1 555 123456",
+ $card = new Component\VCard([
+ "VERSION" => "4.0",
+ "UID" => "foo",
+ "BDAY" => "19850407",
+ "REV" => "19951031T222710Z",
+ "LANG" => "nl",
+ "N" => ["Last", "First", "Middle", "", ""],
+ "item1.TEL" => "+1 555 123456",
"item1.X-AB-LABEL" => "Walkie Talkie",
- "ADR" => array(
+ "ADR" => [
"",
"",
- array("My Street", "Left Side", "Second Shack"),
+ ["My Street", "Left Side", "Second Shack"],
"Hometown",
"PA",
"18252",
"U.S.A",
- ),
- ));
+ ],
+ ]);
- $card->add('BDAY', '1979-12-25', array('VALUE' => 'DATE', 'X-PARAM' => array(1,2)));
- $card->add('BDAY', '1979-12-25T02:00:00', array('VALUE' => 'DATE-TIME'));
+ $card->add('BDAY', '1979-12-25', ['VALUE' => 'DATE', 'X-PARAM' => [1, 2]]);
+ $card->add('BDAY', '1979-12-25T02:00:00', ['VALUE' => 'DATE-TIME']);
- $card->add('X-TRUNCATED', '--1225', array('VALUE' => 'DATE'));
- $card->add('X-TIME-LOCAL', '123000', array('VALUE' => 'TIME'));
- $card->add('X-TIME-UTC', '12:30:00Z', array('VALUE' => 'TIME'));
- $card->add('X-TIME-OFFSET', '12:30:00-08:00', array('VALUE' => 'TIME'));
- $card->add('X-TIME-REDUCED', '23', array('VALUE' => 'TIME'));
- $card->add('X-TIME-TRUNCATED', '--30', array('VALUE' => 'TIME'));
+ $card->add('X-TRUNCATED', '--1225', ['VALUE' => 'DATE']);
+ $card->add('X-TIME-LOCAL', '123000', ['VALUE' => 'TIME']);
+ $card->add('X-TIME-UTC', '12:30:00Z', ['VALUE' => 'TIME']);
+ $card->add('X-TIME-OFFSET', '12:30:00-08:00', ['VALUE' => 'TIME']);
+ $card->add('X-TIME-REDUCED', '23', ['VALUE' => 'TIME']);
+ $card->add('X-TIME-TRUNCATED', '--30', ['VALUE' => 'TIME']);
- $card->add('X-KARMA-POINTS', '42', array('VALUE' => 'INTEGER'));
- $card->add('X-GRADE', '1.3', array('VALUE' => 'FLOAT'));
+ $card->add('X-KARMA-POINTS', '42', ['VALUE' => 'INTEGER']);
+ $card->add('X-GRADE', '1.3', ['VALUE' => 'FLOAT']);
- $card->add('TZ', '-0500', array('VALUE' => 'UTC-OFFSET'));
+ $card->add('TZ', '-0500', ['VALUE' => 'UTC-OFFSET']);
- $expected = array(
+ $expected = [
"vcard",
- array(
- array(
+ [
+ [
"version",
new \StdClass(),
"text",
"4.0"
- ),
- array(
+ ],
+ [
"prodid",
new \StdClass(),
"text",
"-//Sabre//Sabre VObject " . Version::VERSION . "//EN",
- ),
- array(
+ ],
+ [
"uid",
new \StdClass(),
"text",
"foo",
- ),
- array(
+ ],
+ [
"bday",
new \StdClass(),
"date-and-or-time",
"1985-04-07",
- ),
- array(
+ ],
+ [
"rev",
new \StdClass(),
"timestamp",
"1995-10-31T22:27:10Z",
- ),
- array(
+ ],
+ [
"lang",
new \StdClass(),
"language-tag",
"nl",
- ),
- array(
+ ],
+ [
"n",
new \StdClass(),
"text",
- array("Last", "First", "Middle", "", ""),
- ),
- array(
+ ["Last", "First", "Middle", "", ""],
+ ],
+ [
"tel",
- (object)array(
+ (object)[
"group" => "item1",
- ),
+ ],
"text",
"+1 555 123456",
- ),
- array(
+ ],
+ [
"x-ab-label",
- (object)array(
+ (object)[
"group" => "item1",
- ),
+ ],
"unknown",
"Walkie Talkie",
- ),
- array(
+ ],
+ [
"adr",
new \StdClass(),
"text",
- array(
+ [
"",
"",
- array("My Street", "Left Side", "Second Shack"),
+ ["My Street", "Left Side", "Second Shack"],
"Hometown",
"PA",
"18252",
"U.S.A",
- ),
- ),
- array(
+ ],
+ ],
+ [
"bday",
- (object)array(
- 'x-param' => array(1,2),
- ),
+ (object)[
+ 'x-param' => [1,2],
+ ],
"date",
"1979-12-25",
- ),
- array(
+ ],
+ [
"bday",
new \StdClass(),
"date-time",
"1979-12-25T02:00:00",
- ),
- array(
+ ],
+ [
"x-truncated",
new \StdClass(),
"date",
"--12-25",
- ),
- array(
+ ],
+ [
"x-time-local",
new \StdClass(),
"time",
"12:30:00"
- ),
- array(
+ ],
+ [
"x-time-utc",
new \StdClass(),
"time",
"12:30:00Z"
- ),
- array(
+ ],
+ [
"x-time-offset",
new \StdClass(),
"time",
"12:30:00-08:00"
- ),
- array(
+ ],
+ [
"x-time-reduced",
new \StdClass(),
"time",
"23"
- ),
- array(
+ ],
+ [
"x-time-truncated",
new \StdClass(),
"time",
"--30"
- ),
- array(
+ ],
+ [
"x-karma-points",
new \StdClass(),
"integer",
42
- ),
- array(
+ ],
+ [
"x-grade",
new \StdClass(),
"float",
1.3
- ),
- array(
+ ],
+ [
"tz",
new \StdClass(),
"utc-offset",
"-05:00",
- ),
- ),
- );
+ ],
+ ],
+ ];
$this->assertEquals($expected, $card->jsonSerialize());
diff --git a/tests/VObject/ParameterTest.php b/tests/VObject/ParameterTest.php
index 96f016d..e4f9731 100644
--- a/tests/VObject/ParameterTest.php
+++ b/tests/VObject/ParameterTest.php
@@ -8,9 +8,9 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name','value');
- $this->assertEquals('NAME',$param->name);
- $this->assertEquals('value',$param->getValue());
+ $param = new Parameter($cal, 'name', 'value');
+ $this->assertEquals('NAME', $param->name);
+ $this->assertEquals('value', $param->getValue());
}
@@ -18,9 +18,9 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$card = new Component\VCard();
- $param = new Parameter($card, null,'URL');
- $this->assertEquals('VALUE',$param->name);
- $this->assertEquals('URL',$param->getValue());
+ $param = new Parameter($card, null, 'URL');
+ $this->assertEquals('VALUE', $param->name);
+ $this->assertEquals('URL', $param->getValue());
$this->assertTrue($param->noName);
}
@@ -31,17 +31,17 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$param = new Parameter($cal, 'name', null);
$param->addValue(1);
- $this->assertEquals(array(1), $param->getParts());
+ $this->assertEquals([1], $param->getParts());
- $param->setParts(array(1,2));
- $this->assertEquals(array(1,2), $param->getParts());
+ $param->setParts([1, 2]);
+ $this->assertEquals([1, 2], $param->getParts());
$param->addValue(3);
- $this->assertEquals(array(1,2,3), $param->getParts());
+ $this->assertEquals([1, 2, 3], $param->getParts());
$param->setValue(4);
$param->addValue(5);
- $this->assertEquals(array(4,5), $param->getParts());
+ $this->assertEquals([4, 5], $param->getParts());
}
@@ -49,8 +49,8 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
$param = new Parameter($cal, 'name', 'value');
- $this->assertEquals('value',$param->__toString());
- $this->assertEquals('value',(string)$param);
+ $this->assertEquals('value', $param->__toString());
+ $this->assertEquals('value', (string)$param);
}
@@ -58,8 +58,8 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
$param = new Parameter($cal, 'name', null);
- $this->assertEquals('',$param->__toString());
- $this->assertEquals('',(string)$param);
+ $this->assertEquals('', $param->__toString());
+ $this->assertEquals('', (string)$param);
}
@@ -67,7 +67,7 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
$param = new Parameter($cal, 'name', 'value');
- $this->assertEquals('NAME=value',$param->serialize());
+ $this->assertEquals('NAME=value', $param->serialize());
}
@@ -75,15 +75,15 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
$param = new Parameter($cal, 'name', null);
- $this->assertEquals('NAME=',$param->serialize());
+ $this->assertEquals('NAME=', $param->serialize());
}
function testSerializeComplex() {
$cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name',array("val1", "val2;", "val3^", "val4\n", "val5\""));
- $this->assertEquals('NAME=val1,"val2;","val3^^","val4^n","val5^\'"',$param->serialize());
+ $param = new Parameter($cal, 'name', ["val1", "val2;", "val3^", "val4\n", "val5\""]);
+ $this->assertEquals('NAME=val1,"val2;","val3^^","val4^n","val5^\'"', $param->serialize());
}
@@ -96,8 +96,8 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
function testSerializePlusSign() {
$cal = new Component\VCalendar();
- $param = new Parameter($cal, 'EMAIL',"user+something at example.org");
- $this->assertEquals('EMAIL="user+something at example.org"',$param->serialize());
+ $param = new Parameter($cal, 'EMAIL', "user+something at example.org");
+ $this->assertEquals('EMAIL="user+something at example.org"', $param->serialize());
}
@@ -105,30 +105,30 @@ class ParameterTest extends \PHPUnit_Framework_TestCase {
$cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', array(1,2,3,4));
- $result = array();
+ $param = new Parameter($cal, 'name', [1, 2, 3, 4]);
+ $result = [];
- foreach($param as $value) {
+ foreach ($param as $value) {
$result[] = $value;
}
- $this->assertEquals(array(1,2,3,4), $result);
+ $this->assertEquals([1, 2, 3, 4], $result);
}
function testSerializeColon() {
$cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name','va:lue');
- $this->assertEquals('NAME="va:lue"',$param->serialize());
+ $param = new Parameter($cal, 'name', 'va:lue');
+ $this->assertEquals('NAME="va:lue"', $param->serialize());
}
function testSerializeSemiColon() {
$cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name','va;lue');
- $this->assertEquals('NAME="va;lue"',$param->serialize());
+ $param = new Parameter($cal, 'name', 'va;lue');
+ $this->assertEquals('NAME="va;lue"', $param->serialize());
}
diff --git a/tests/VObject/Parser/JsonTest.php b/tests/VObject/Parser/JsonTest.php
index a4d27b3..d10f303 100644
--- a/tests/VObject/Parser/JsonTest.php
+++ b/tests/VObject/Parser/JsonTest.php
@@ -9,151 +9,151 @@ class JsonTest extends \PHPUnit_Framework_TestCase {
function testRoundTripJCard() {
- $input = array(
+ $input = [
"vcard",
- array(
- array(
+ [
+ [
"version",
new \StdClass(),
"text",
"4.0"
- ),
- array(
+ ],
+ [
"prodid",
new \StdClass(),
"text",
"-//Sabre//Sabre VObject " . VObject\Version::VERSION . "//EN",
- ),
- array(
+ ],
+ [
"uid",
new \StdClass(),
"text",
"foo",
- ),
- array(
+ ],
+ [
"bday",
new \StdClass(),
"date-and-or-time",
"1985-04-07",
- ),
- array(
+ ],
+ [
"rev",
new \StdClass(),
"timestamp",
"1995-10-31T22:27:10Z",
- ),
- array(
+ ],
+ [
"lang",
new \StdClass(),
"language-tag",
"nl",
- ),
- array(
+ ],
+ [
"n",
new \StdClass(),
"text",
- array("Last", "First", "Middle", "", ""),
- ),
- array(
+ ["Last", "First", "Middle", "", ""],
+ ],
+ [
"tel",
- (object)array(
+ (object)[
"group" => "item1",
- ),
+ ],
"text",
"+1 555 123456",
- ),
- array(
+ ],
+ [
"x-ab-label",
- (object)array(
+ (object)[
"group" => "item1",
- ),
+ ],
"unknown",
"Walkie Talkie",
- ),
- array(
+ ],
+ [
"adr",
new \StdClass(),
"text",
- array(
+ [
"",
"",
- array("My Street", "Left Side", "Second Shack"),
+ ["My Street", "Left Side", "Second Shack"],
"Hometown",
"PA",
"18252",
"U.S.A",
- ),
- ),
- array(
+ ],
+ ],
+ [
"bday",
- (object)array(
- 'x-param' => array(1,2),
- ),
+ (object)[
+ 'x-param' => [1,2],
+ ],
"date",
"1979-12-25",
- ),
- array(
+ ],
+ [
"bday",
new \StdClass(),
"date-time",
"1979-12-25T02:00:00",
- ),
- array(
+ ],
+ [
"x-truncated",
new \StdClass(),
"date",
"--12-25",
- ),
- array(
+ ],
+ [
"x-time-local",
new \StdClass(),
"time",
"12:30:00"
- ),
- array(
+ ],
+ [
"x-time-utc",
new \StdClass(),
"time",
"12:30:00Z"
- ),
- array(
+ ],
+ [
"x-time-offset",
new \StdClass(),
"time",
"12:30:00-08:00"
- ),
- array(
+ ],
+ [
"x-time-reduced",
new \StdClass(),
"time",
"23"
- ),
- array(
+ ],
+ [
"x-time-truncated",
new \StdClass(),
"time",
"--30"
- ),
- array(
+ ],
+ [
"x-karma-points",
new \StdClass(),
"integer",
42
- ),
- array(
+ ],
+ [
"x-grade",
new \StdClass(),
"float",
1.3
- ),
- array(
+ ],
+ [
"tz",
new \StdClass(),
"utc-offset",
"-05:00",
- ),
- ),
- );
+ ],
+ ],
+ ];
$parser = new Json(json_encode($input));
$vobj = $parser->parse();
@@ -198,114 +198,114 @@ VCF;
function testRoundTripJCal() {
- $input = array(
+ $input = [
"vcalendar",
- array(
- array(
+ [
+ [
"version",
new \StdClass(),
"text",
"2.0"
- ),
- array(
+ ],
+ [
"prodid",
new \StdClass(),
"text",
"-//Sabre//Sabre VObject " . VObject\Version::VERSION . "//EN",
- ),
- array(
+ ],
+ [
"calscale",
new \StdClass(),
"text",
"GREGORIAN"
- ),
- ),
- array(
- array("vevent",
- array(
- array(
+ ],
+ ],
+ [
+ ["vevent",
+ [
+ [
"uid", new \StdClass(), "text", "foo",
- ),
- array(
+ ],
+ [
"dtstart", new \StdClass(), "date", "2013-05-26",
- ),
- array(
+ ],
+ [
"duration", new \StdClass(), "duration", "P1D",
- ),
- array(
+ ],
+ [
"categories", new \StdClass(), "text", "home", "testing",
- ),
- array(
+ ],
+ [
"created", new \StdClass(), "date-time", "2013-05-26T18:10:00Z",
- ),
- array(
+ ],
+ [
"attach", new \StdClass(), "binary", base64_encode('attachment')
- ),
- array(
+ ],
+ [
"attendee", new \StdClass(), "cal-address", "mailto:armin at example.org",
- ),
- array(
- "geo", new \StdClass(), "float", array(51.96668, 7.61876),
- ),
- array(
+ ],
+ [
+ "geo", new \StdClass(), "float", [51.96668, 7.61876],
+ ],
+ [
"sequence", new \StdClass(), "integer", 5
- ),
- array(
- "freebusy", new \StdClass(), "period", array("2013-05-26T21:02:13", "PT1H"), array("2013-06-26T12:00:00", "2013-06-26T13:00:00"),
- ),
- array(
+ ],
+ [
+ "freebusy", new \StdClass(), "period", ["2013-05-26T21:02:13", "PT1H"], ["2013-06-26T12:00:00", "2013-06-26T13:00:00"],
+ ],
+ [
"url", new \StdClass(), "uri", "http://example.org/",
- ),
- array(
+ ],
+ [
"tzoffsetfrom", new \StdClass(), "utc-offset", "+05:00",
- ),
- array(
- "rrule", new \StdClass(), "recur", array(
- 'freq' => 'WEEKLY',
- 'byday' => array('MO', 'TU'),
- ),
- ),
- array(
+ ],
+ [
+ "rrule", new \StdClass(), "recur", [
+ 'freq' => 'WEEKLY',
+ 'byday' => ['MO', 'TU'],
+ ],
+ ],
+ [
"x-bool", new \StdClass(), "boolean", true
- ),
- array(
+ ],
+ [
"x-time", new \StdClass(), "time", "08:00:00",
- ),
- array(
+ ],
+ [
"attendee",
- (object)array(
- "cn" => "Dominik",
+ (object)[
+ "cn" => "Dominik",
"partstat" => "DECLINED",
- ),
+ ],
"cal-address",
"mailto:dominik at example.org"
- ),
- array(
+ ],
+ [
"request-status",
new \StdClass(),
"text",
- array("2.0", "Success"),
- ),
- array(
+ ["2.0", "Success"],
+ ],
+ [
"request-status",
new \StdClass(),
"text",
- array("3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith at example.org"),
- ),
- ),
- array(
- array("valarm",
- array(
- array(
+ ["3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith at example.org"],
+ ],
+ ],
+ [
+ ["valarm",
+ [
+ [
"action", new \StdClass(), "text", "DISPLAY",
- ),
- ),
- array(),
- ),
- ),
- )
- ),
- );
+ ],
+ ],
+ [],
+ ],
+ ],
+ ]
+ ],
+ ];
$parser = new Json(json_encode($input));
$vobj = $parser->parse();
@@ -355,20 +355,20 @@ VCF;
function testParseStreamArg() {
- $input = array(
+ $input = [
"vcard",
- array(
- array(
+ [
+ [
"FN", new \StdClass(), 'text', "foo",
- ),
- ),
- );
+ ],
+ ],
+ ];
- $stream = fopen('php://memory','r+');
+ $stream = fopen('php://memory', 'r+');
fwrite($stream, json_encode($input));
rewind($stream);
- $result = VObject\Reader::readJson($stream,0);
+ $result = VObject\Reader::readJson($stream, 0);
$this->assertEquals('foo', $result->FN->getValue());
}
@@ -379,14 +379,14 @@ VCF;
function testParseInvalidData() {
$json = new Json();
- $input = array(
+ $input = [
"vlist",
- array(
- array(
+ [
+ [
"FN", new \StdClass(), 'text', "foo",
- ),
- ),
- );
+ ],
+ ],
+ ];
$json->parse(json_encode($input), 0);
diff --git a/tests/VObject/Parser/MimeDirTest.php b/tests/VObject/Parser/MimeDirTest.php
index b4ee47c..60bd86a 100644
--- a/tests/VObject/Parser/MimeDirTest.php
+++ b/tests/VObject/Parser/MimeDirTest.php
@@ -14,7 +14,7 @@ class MimeDirTest extends \PHPUnit_Framework_TestCase {
function testParseError() {
$mimeDir = new MimeDir();
- $mimeDir->parse(fopen(__FILE__,'a'));
+ $mimeDir->parse(fopen(__FILE__, 'a'));
}
diff --git a/tests/VObject/Parser/QuotedPrintableTest.php b/tests/VObject/Parser/QuotedPrintableTest.php
index a66af69..2ba926f 100644
--- a/tests/VObject/Parser/QuotedPrintableTest.php
+++ b/tests/VObject/Parser/QuotedPrintableTest.php
@@ -70,9 +70,9 @@ END:VCARD
VCF;
$result = Reader::read($data, Reader::OPTION_FORGIVING);
- $this->assertEquals(array(
- '','','Münster Str. 1','Münster','','48143','Deutschland'
- ), $result->ADR->getParts());
+ $this->assertEquals([
+ '', '', 'Münster Str. 1', 'Münster', '', '48143', 'Deutschland'
+ ], $result->ADR->getParts());
}
diff --git a/tests/VObject/Property/BinaryTest.php b/tests/VObject/Property/BinaryTest.php
index 0a8c79c..aaa74c7 100644
--- a/tests/VObject/Property/BinaryTest.php
+++ b/tests/VObject/Property/BinaryTest.php
@@ -12,7 +12,7 @@ class BinaryTest extends \PHPUnit_Framework_TestCase {
function testMimeDir() {
$vcard = new VObject\Component\VCard();
- $vcard->add('PHOTO', array('a','b'));
+ $vcard->add('PHOTO', ['a', 'b']);
}
diff --git a/tests/VObject/Property/CompoundTest.php b/tests/VObject/Property/CompoundTest.php
index 448a478..ced0d7a 100644
--- a/tests/VObject/Property/CompoundTest.php
+++ b/tests/VObject/Property/CompoundTest.php
@@ -8,11 +8,11 @@ class CompoundTest extends \PHPUnit_Framework_TestCase {
function testSetParts() {
- $arr = array(
+ $arr = [
'ABC, Inc.',
'North American Division',
'Marketing;Sales',
- );
+ ];
$vcard = new VCard();
$elem = $vcard->createProperty('ORG');
diff --git a/tests/VObject/Property/FloatTest.php b/tests/VObject/Property/FloatTest.php
index 9321c88..7a9918a 100644
--- a/tests/VObject/Property/FloatTest.php
+++ b/tests/VObject/Property/FloatTest.php
@@ -15,10 +15,10 @@ class FloatTest extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf('Sabre\VObject\Property\Float', $result->{'X-FLOAT'});
- $this->assertEquals(array(
+ $this->assertEquals([
0.234,
1.245,
- ), $result->{'X-FLOAT'}->getParts());
+ ], $result->{'X-FLOAT'}->getParts());
$this->assertEquals(
$input,
diff --git a/tests/VObject/Property/ICalendar/CalAddressTest.php b/tests/VObject/Property/ICalendar/CalAddressTest.php
index 168751a..fe2a550 100644
--- a/tests/VObject/Property/ICalendar/CalAddressTest.php
+++ b/tests/VObject/Property/ICalendar/CalAddressTest.php
@@ -21,11 +21,11 @@ class CalAddressTest extends \PHPUnit_Framework_TestCase {
function values() {
- return array(
- array('mailto:a at b.com', 'mailto:a at b.com'),
- array('mailto:a at b.com', 'MAILTO:a at b.com'),
- array('/foo/bar', '/foo/bar'),
- );
+ return [
+ ['mailto:a at b.com', 'mailto:a at b.com'],
+ ['mailto:a at b.com', 'MAILTO:a at b.com'],
+ ['/foo/bar', '/foo/bar'],
+ ];
}
diff --git a/tests/VObject/Property/ICalendar/DateTimeTest.php b/tests/VObject/Property/ICalendar/DateTimeTest.php
index fa12060..3f35b92 100644
--- a/tests/VObject/Property/ICalendar/DateTimeTest.php
+++ b/tests/VObject/Property/ICalendar/DateTimeTest.php
@@ -2,10 +2,8 @@
namespace Sabre\VObject\Property\ICalendar;
-use Sabre\VObject\Component;
use Sabre\VObject\Component\VCalendar;
-
class DateTimeTest extends \PHPUnit_Framework_TestCase {
protected $vcal;
@@ -135,7 +133,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
$dt2->setTimeZone($tz);
$elem = $this->vcal->createProperty('DTSTART');
- $elem->setValue(array($dt1, $dt2));
+ $elem->setValue([$dt1, $dt2]);
$this->assertEquals('19850704T013000,19850704T023000', (string)$elem);
$this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
@@ -154,7 +152,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
$dt2->setTimeZone($tz);
$elem = $this->vcal->createProperty('DTSTART');
- $elem->setParts(array($dt1, $dt2));
+ $elem->setParts([$dt1, $dt2]);
$this->assertEquals('19850704T013000,19850704T023000', (string)$elem);
$this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
@@ -169,7 +167,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
$dt2 = '19850704T023000Z';
$elem = $this->vcal->createProperty('DTSTART');
- $elem->setParts(array($dt1, $dt2));
+ $elem->setParts([$dt1, $dt2]);
$this->assertEquals('19850704T013000Z,19850704T023000Z', (string)$elem);
$this->assertNull($elem['VALUE']);
@@ -203,7 +201,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
function testGetDateTimeDateDATE() {
- $elem = $this->vcal->createProperty('DTSTART','19850704');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704');
$dt = $elem->getDateTime();
$this->assertInstanceOf('DateTimeImmutable', $dt);
@@ -213,7 +211,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
function testGetDateTimeDateDATEReferenceTimeZone() {
- $elem = $this->vcal->createProperty('DTSTART','19850704');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704');
$tz = new \DateTimeZone('America/Toronto');
$dt = $elem->getDateTime($tz);
@@ -226,7 +224,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
function testGetDateTimeDateFloating() {
- $elem = $this->vcal->createProperty('DTSTART','19850704T013000');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
$dt = $elem->getDateTime();
$this->assertInstanceOf('DateTimeImmutable', $dt);
@@ -236,7 +234,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
function testGetDateTimeDateFloatingReferenceTimeZone() {
- $elem = $this->vcal->createProperty('DTSTART','19850704T013000');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
$tz = new \DateTimeZone('America/Toronto');
$dt = $elem->getDateTime($tz);
@@ -249,7 +247,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
function testGetDateTimeDateUTC() {
- $elem = $this->vcal->createProperty('DTSTART','19850704T013000Z');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704T013000Z');
$dt = $elem->getDateTime();
$this->assertInstanceOf('DateTimeImmutable', $dt);
@@ -260,7 +258,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
function testGetDateTimeDateLOCALTZ() {
- $elem = $this->vcal->createProperty('DTSTART','19850704T013000');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
$elem['TZID'] = 'Europe/Amsterdam';
$dt = $elem->getDateTime();
@@ -276,14 +274,14 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
*/
function testGetDateTimeDateInvalid() {
- $elem = $this->vcal->createProperty('DTSTART','bla');
+ $elem = $this->vcal->createProperty('DTSTART', 'bla');
$dt = $elem->getDateTime();
}
function testGetDateTimeWeirdTZ() {
- $elem = $this->vcal->createProperty('DTSTART','19850704T013000');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
$elem['TZID'] = '/freeassociation.sourceforge.net/Tzfile/Europe/Amsterdam';
@@ -310,7 +308,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
$default = date_default_timezone_get();
date_default_timezone_set('Canada/Eastern');
- $elem = $this->vcal->createProperty('DTSTART','19850704T013000');
+ $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
$elem['TZID'] = 'Moon';
@@ -363,7 +361,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase {
$dtstart = $vevent->add(
'DTSTART',
new \DateTime('2014-03-07'),
- array('VALUE' => 'DATE')
+ ['VALUE' => 'DATE']
);
$this->assertEquals("DTSTART;VALUE=DATE:20140307\r\n", $dtstart->serialize());
diff --git a/tests/VObject/Property/ICalendar/DurationTest.php b/tests/VObject/Property/ICalendar/DurationTest.php
index c5c96e4..9aaaebc 100644
--- a/tests/VObject/Property/ICalendar/DurationTest.php
+++ b/tests/VObject/Property/ICalendar/DurationTest.php
@@ -10,11 +10,11 @@ class DurationTest extends \PHPUnit_Framework_TestCase {
function testGetDateInterval() {
$vcal = new VCalendar();
- $event = $vcal->add('VEVENT', array('DURATION' => array('PT1H')));
+ $event = $vcal->add('VEVENT', ['DURATION' => ['PT1H']]);
$this->assertEquals(
new \DateInterval('PT1H'),
$event->{'DURATION'}->getDateInterval()
);
}
-}
+}
diff --git a/tests/VObject/Property/ICalendar/RecurTest.php b/tests/VObject/Property/ICalendar/RecurTest.php
index 3eb04e4..846fc28 100644
--- a/tests/VObject/Property/ICalendar/RecurTest.php
+++ b/tests/VObject/Property/ICalendar/RecurTest.php
@@ -13,10 +13,10 @@ class RecurTest extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf('Sabre\VObject\Property\ICalendar\Recur', $recur);
- $this->assertEquals(array('FREQ'=>'DAILY'), $recur->getParts());
- $recur->setParts(array('freq'=>'MONTHLY'));
+ $this->assertEquals(['FREQ' => 'DAILY'], $recur->getParts());
+ $recur->setParts(['freq' => 'MONTHLY']);
- $this->assertEquals(array('FREQ'=>'MONTHLY'), $recur->getParts());
+ $this->assertEquals(['FREQ' => 'MONTHLY'], $recur->getParts());
}
@@ -34,13 +34,13 @@ class RecurTest extends \PHPUnit_Framework_TestCase {
function testSetSubParts() {
$vcal = new VCalendar();
- $recur = $vcal->add('RRULE', array('FREQ'=>'DAILY', 'BYDAY'=>'mo,tu', 'BYMONTH' => array(0,1)));
+ $recur = $vcal->add('RRULE', ['FREQ' => 'DAILY', 'BYDAY' => 'mo,tu', 'BYMONTH' => [0, 1]]);
- $this->assertEquals(array(
- 'FREQ'=>'DAILY',
- 'BYDAY' => array('MO','TU'),
- 'BYMONTH' => array(0,1),
- ), $recur->getParts());
+ $this->assertEquals([
+ 'FREQ' => 'DAILY',
+ 'BYDAY' => ['MO', 'TU'],
+ 'BYMONTH' => [0, 1],
+ ], $recur->getParts());
}
}
diff --git a/tests/VObject/Property/TextTest.php b/tests/VObject/Property/TextTest.php
index 8f698f7..fe44d7a 100644
--- a/tests/VObject/Property/TextTest.php
+++ b/tests/VObject/Property/TextTest.php
@@ -8,10 +8,10 @@ class TextTest extends \PHPUnit_Framework_TestCase {
function assertVCard21serialization($propValue, $expected) {
- $doc = new VCard(array(
- 'VERSION'=>'2.1',
- 'PROP' => $propValue
- ), false);
+ $doc = new VCard([
+ 'VERSION' => '2.1',
+ 'PROP' => $propValue
+ ], false);
// Adding quoted-printable, because we're testing if it gets removed
// automatically.
@@ -38,7 +38,7 @@ class TextTest extends \PHPUnit_Framework_TestCase {
function testSerializeVCard21Array() {
$this->assertVCard21Serialization(
- array('f;oo','bar'),
+ ['f;oo', 'bar'],
'PROP;P1=V1:f\;oo;bar'
);
@@ -46,8 +46,8 @@ class TextTest extends \PHPUnit_Framework_TestCase {
function testSerializeVCard21Fold() {
$this->assertVCard21Serialization(
- str_repeat('x',80),
- 'PROP;P1=V1:' . str_repeat('x',64) . "\r\n " . str_repeat('x',16)
+ str_repeat('x', 80),
+ 'PROP;P1=V1:' . str_repeat('x', 64) . "\r\n " . str_repeat('x', 16)
);
}
diff --git a/tests/VObject/Property/VCard/DateAndOrTimeTest.php b/tests/VObject/Property/VCard/DateAndOrTimeTest.php
index 0f9a32c..95e1585 100644
--- a/tests/VObject/Property/VCard/DateAndOrTimeTest.php
+++ b/tests/VObject/Property/VCard/DateAndOrTimeTest.php
@@ -2,9 +2,8 @@
namespace Sabre\VObject\Property\VCard;
-use
- Sabre\VObject,
- Sabre\VObject\Reader;
+use Sabre\VObject;
+use Sabre\VObject\Reader;
class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
@@ -16,81 +15,81 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
$vcard = new VObject\Component\VCard();
$prop = $vcard->createProperty('BDAY', $input);
- $this->assertEquals(array($output), $prop->getJsonValue());
+ $this->assertEquals([$output], $prop->getJsonValue());
}
function dates() {
- return array(
- array(
+ return [
+ [
"19961022T140000",
"1996-10-22T14:00:00",
- ),
- array(
+ ],
+ [
"--1022T1400",
"--10-22T14:00",
- ),
- array(
+ ],
+ [
"---22T14",
"---22T14",
- ),
- array(
+ ],
+ [
"19850412",
"1985-04-12",
- ),
- array(
+ ],
+ [
"1985-04",
"1985-04",
- ),
- array(
+ ],
+ [
"1985",
"1985",
- ),
- array(
+ ],
+ [
"--0412",
"--04-12",
- ),
- array(
+ ],
+ [
"T102200",
"T10:22:00",
- ),
- array(
+ ],
+ [
"T1022",
"T10:22",
- ),
- array(
+ ],
+ [
"T10",
"T10",
- ),
- array(
+ ],
+ [
"T-2200",
"T-22:00",
- ),
- array(
+ ],
+ [
"T102200Z",
"T10:22:00Z",
- ),
- array(
+ ],
+ [
"T102200-0800",
"T10:22:00-0800",
- ),
- array(
+ ],
+ [
"T--00",
"T--00",
- ),
- );
+ ],
+ ];
}
- public function testSetParts() {
+ function testSetParts() {
$vcard = new VObject\Component\VCard();
$prop = $vcard->createProperty('BDAY');
- $prop->setParts(array(
+ $prop->setParts([
new \DateTime('2014-04-02 18:37:00')
- ));
+ ]);
$this->assertEquals('20140402T183700Z', $prop->getValue());
@@ -99,32 +98,32 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
/**
* @expectedException InvalidArgumentException
*/
- public function testSetPartsTooMany() {
+ function testSetPartsTooMany() {
$vcard = new VObject\Component\VCard();
$prop = $vcard->createProperty('BDAY');
- $prop->setParts(array(
+ $prop->setParts([
1,
2
- ));
+ ]);
}
- public function testSetPartsString() {
+ function testSetPartsString() {
$vcard = new VObject\Component\VCard();
$prop = $vcard->createProperty('BDAY');
- $prop->setParts(array(
+ $prop->setParts([
"20140402T183700Z"
- ));
+ ]);
$this->assertEquals('20140402T183700Z', $prop->getValue());
}
- public function testSetValueDateTime() {
+ function testSetValueDateTime() {
$vcard = new VObject\Component\VCard();
@@ -137,7 +136,7 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
}
- public function testSetDateTimeOffset() {
+ function testSetDateTimeOffset() {
$vcard = new VObject\Component\VCard();
@@ -150,7 +149,7 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
}
- public function testGetDateTime() {
+ function testGetDateTime() {
$datetime = new \DateTime('2014-04-02 18:37:00', new \DateTimeZone('America/Toronto'));
@@ -162,7 +161,7 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
}
- public function testGetDate() {
+ function testGetDate() {
$datetime = new \DateTime('2014-04-02');
@@ -174,7 +173,7 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
}
- public function testGetDateIncomplete() {
+ function testGetDateIncomplete() {
$datetime = '--0407';
@@ -193,7 +192,7 @@ class DateAndOrTimeTest extends \PHPUnit_Framework_TestCase {
}
- public function testGetDateIncompleteFromVCard() {
+ function testGetDateIncompleteFromVCard() {
$vcard = <<<VCF
BEGIN:VCARD
@@ -216,30 +215,29 @@ VCF;
}
- public function testValidate() {
+ function testValidate() {
$datetime = '--0407';
$vcard = new VObject\Component\VCard();
$prop = $vcard->add('BDAY', $datetime);
- $this->assertEquals(array(), $prop->validate());
+ $this->assertEquals([], $prop->validate());
}
- public function testValidateBroken() {
+ function testValidateBroken() {
$datetime = '123';
$vcard = new VObject\Component\VCard();
$prop = $vcard->add('BDAY', $datetime);
- $this->assertEquals(array(array(
- 'level' => 3,
+ $this->assertEquals([[
+ 'level' => 3,
'message' => 'The supplied value (123) is not a correct DATE-AND-OR-TIME property',
- 'node' => $prop,
- )), $prop->validate());
+ 'node' => $prop,
+ ]], $prop->validate());
}
}
-
diff --git a/tests/VObject/Property/VCard/LanguageTagTest.php b/tests/VObject/Property/VCard/LanguageTagTest.php
index 8cae8a7..c38b6f2 100644
--- a/tests/VObject/Property/VCard/LanguageTagTest.php
+++ b/tests/VObject/Property/VCard/LanguageTagTest.php
@@ -34,7 +34,7 @@ class LanguageTagTest extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf('Sabre\VObject\Property\VCard\LanguageTag', $result->LANG);
// This replicates what the vcard converter does and triggered a bug in
// the past.
- $result->LANG->setValue(array('de'));
+ $result->LANG->setValue(['de']);
$this->assertEquals('de', $result->LANG->getValue());
diff --git a/tests/VObject/PropertyTest.php b/tests/VObject/PropertyTest.php
index 7e600bc..10425ba 100644
--- a/tests/VObject/PropertyTest.php
+++ b/tests/VObject/PropertyTest.php
@@ -2,9 +2,8 @@
namespace Sabre\VObject;
-use
- Sabre\VObject\Component\VCalendar,
- Sabre\VObject\Component\VCard;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VCard;
class PropertyTest extends \PHPUnit_Framework_TestCase {
@@ -12,7 +11,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$this->assertEquals('PROPNAME', $property->name);
$this->assertEquals('propvalue', $property->__toString());
$this->assertEquals('propvalue', (string)$property);
@@ -24,12 +23,12 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$cal = new VCalendar();
- $params = array(
+ $params = [
'param1' => 'value1',
'param2' => 'value2',
- );
+ ];
- $property = $cal->createProperty('propname','propvalue', $params);
+ $property = $cal->createProperty('propname', 'propvalue', $params);
$this->assertEquals('value1', $property['param1']->getValue());
$this->assertEquals('value2', $property['param2']->getValue());
@@ -40,7 +39,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property->setValue('value2');
$this->assertEquals('PROPNAME', $property->name);
@@ -51,7 +50,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testParameterExists() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property['paramname'] = 'paramvalue';
$this->assertTrue(isset($property['PARAMNAME']));
@@ -63,107 +62,107 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testParameterGet() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property['paramname'] = 'paramvalue';
- $this->assertInstanceOf('Sabre\\VObject\\Parameter',$property['paramname']);
+ $this->assertInstanceOf('Sabre\\VObject\\Parameter', $property['paramname']);
}
function testParameterNotExists() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property['paramname'] = 'paramvalue';
- $this->assertInternalType('null',$property['foo']);
+ $this->assertInternalType('null', $property['foo']);
}
function testParameterMultiple() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property['paramname'] = 'paramvalue';
$property->add('paramname', 'paramvalue');
- $this->assertInstanceOf('Sabre\\VObject\\Parameter',$property['paramname']);
- $this->assertEquals(2,count($property['paramname']->getParts()));
+ $this->assertInstanceOf('Sabre\\VObject\\Parameter', $property['paramname']);
+ $this->assertEquals(2, count($property['paramname']->getParts()));
}
function testSetParameterAsString() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property['paramname'] = 'paramvalue';
- $this->assertEquals(1,count($property->parameters()));
+ $this->assertEquals(1, count($property->parameters()));
$this->assertInstanceOf('Sabre\\VObject\\Parameter', $property->parameters['PARAMNAME']);
- $this->assertEquals('PARAMNAME',$property->parameters['PARAMNAME']->name);
- $this->assertEquals('paramvalue',$property->parameters['PARAMNAME']->getValue());
+ $this->assertEquals('PARAMNAME', $property->parameters['PARAMNAME']->name);
+ $this->assertEquals('paramvalue', $property->parameters['PARAMNAME']->getValue());
}
function testUnsetParameter() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$property['paramname'] = 'paramvalue';
unset($property['PARAMNAME']);
- $this->assertEquals(0,count($property->parameters()));
+ $this->assertEquals(0, count($property->parameters()));
}
function testSerialize() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
- $this->assertEquals("PROPNAME:propvalue\r\n",$property->serialize());
+ $this->assertEquals("PROPNAME:propvalue\r\n", $property->serialize());
}
function testSerializeParam() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue', array(
- 'paramname' => 'paramvalue',
+ $property = $cal->createProperty('propname', 'propvalue', [
+ 'paramname' => 'paramvalue',
'paramname2' => 'paramvalue2',
- ));
+ ]);
- $this->assertEquals("PROPNAME;PARAMNAME=paramvalue;PARAMNAME2=paramvalue2:propvalue\r\n",$property->serialize());
+ $this->assertEquals("PROPNAME;PARAMNAME=paramvalue;PARAMNAME2=paramvalue2:propvalue\r\n", $property->serialize());
}
function testSerializeNewLine() {
$cal = new VCalendar();
- $property = $cal->createProperty('SUMMARY',"line1\nline2");
+ $property = $cal->createProperty('SUMMARY', "line1\nline2");
- $this->assertEquals("SUMMARY:line1\\nline2\r\n",$property->serialize());
+ $this->assertEquals("SUMMARY:line1\\nline2\r\n", $property->serialize());
}
function testSerializeLongLine() {
$cal = new VCalendar();
- $value = str_repeat('!',200);
- $property = $cal->createProperty('propname',$value);
+ $value = str_repeat('!', 200);
+ $property = $cal->createProperty('propname', $value);
- $expected = "PROPNAME:" . str_repeat('!',66) . "\r\n " . str_repeat('!',74) . "\r\n " . str_repeat('!',60) . "\r\n";
+ $expected = "PROPNAME:" . str_repeat('!', 66) . "\r\n " . str_repeat('!', 74) . "\r\n " . str_repeat('!', 60) . "\r\n";
- $this->assertEquals($expected,$property->serialize());
+ $this->assertEquals($expected, $property->serialize());
}
function testSerializeUTF8LineFold() {
$cal = new VCalendar();
- $value = str_repeat('!',65) . "\xc3\xa4bla"; // inserted umlaut-a
+ $value = str_repeat('!', 65) . "\xc3\xa4bla"; // inserted umlaut-a
$property = $cal->createProperty('propname', $value);
- $expected = "PROPNAME:" . str_repeat('!',65) . "\r\n \xc3\xa4bla\r\n";
+ $expected = "PROPNAME:" . str_repeat('!', 65) . "\r\n \xc3\xa4bla\r\n";
$this->assertEquals($expected, $property->serialize());
}
@@ -171,10 +170,10 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testGetIterator() {
$cal = new VCalendar();
- $it = new ElementList(array());
- $property = $cal->createProperty('propname','propvalue');
+ $it = new ElementList([]);
+ $property = $cal->createProperty('propname', 'propvalue');
$property->setIterator($it);
- $this->assertEquals($it,$property->getIterator());
+ $this->assertEquals($it, $property->getIterator());
}
@@ -182,10 +181,10 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testGetIteratorDefault() {
$cal = new VCalendar();
- $property = $cal->createProperty('propname','propvalue');
+ $property = $cal->createProperty('propname', 'propvalue');
$it = $property->getIterator();
$this->assertTrue($it instanceof ElementList);
- $this->assertEquals(1,count($it));
+ $this->assertEquals(1, count($it));
}
@@ -194,13 +193,13 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$cal = new VCalendar();
$property = $cal->createProperty('EMAIL');
- $property->add('myparam','value');
+ $property->add('myparam', 'value');
$this->assertEquals(1, count($property->parameters()));
$this->assertTrue($property->parameters['MYPARAM'] instanceof Parameter);
- $this->assertEquals('MYPARAM',$property->parameters['MYPARAM']->name);
- $this->assertEquals('value',$property->parameters['MYPARAM']->getValue());
+ $this->assertEquals('MYPARAM', $property->parameters['MYPARAM']->name);
+ $this->assertEquals('value', $property->parameters['MYPARAM']->getValue());
}
@@ -209,10 +208,10 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$cal = new VCalendar();
$prop = $cal->createProperty('EMAIL');
- $prop->add('MYPARAM','value');
+ $prop->add('MYPARAM', 'value');
$this->assertEquals(1, count($prop->parameters()));
- $this->assertEquals('MYPARAM',$prop['myparam']->name);
+ $this->assertEquals('MYPARAM', $prop['myparam']->name);
}
@@ -227,7 +226,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(1, count($prop->parameters));
$this->assertEquals(2, count($prop->parameters['MYPARAM']->getParts()));
- $this->assertEquals('MYPARAM',$prop['MYPARAM']->name);
+ $this->assertEquals('MYPARAM', $prop['MYPARAM']->name);
}
@@ -235,7 +234,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testClone() {
$cal = new VCalendar();
- $property = $cal->createProperty('EMAIL','value');
+ $property = $cal->createProperty('EMAIL', 'value');
$property['FOO'] = 'BAR';
$property2 = clone $property;
@@ -248,10 +247,10 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testCreateParams() {
$cal = new VCalendar();
- $property = $cal->createProperty('X-PROP','value', array(
+ $property = $cal->createProperty('X-PROP', 'value', [
'param1' => 'value1',
- 'param2' => array('value2', 'value3')
- ));
+ 'param2' => ['value2', 'value3']
+ ]);
$this->assertEquals(1, count($property['PARAM1']->getParts()));
$this->assertEquals(2, count($property['PARAM2']->getParts()));
@@ -272,13 +271,13 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testValidateControlChars() {
$s = "chars[";
- foreach (array(
+ foreach ([
0x7F, 0x5E, 0x5C, 0x3B, 0x3A, 0x2C, 0x22, 0x20,
0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18,
0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
- ) as $c) {
+ ] as $c) {
$s .= sprintf('%02X(%c)', $c, $c);
}
$s .= "]end";
@@ -307,23 +306,23 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
$calendar = new VCalendar();
$property = $calendar->createProperty("SUMMARY", null);
- $this->assertEquals(array(), $property->getParts());
+ $this->assertEquals([], $property->getParts());
$this->assertNull($property->getValue());
- $property->setValue(array());
- $this->assertEquals(array(), $property->getParts());
+ $property->setValue([]);
+ $this->assertEquals([], $property->getParts());
$this->assertNull($property->getValue());
- $property->setValue(array(1));
- $this->assertEquals(array(1), $property->getParts());
+ $property->setValue([1]);
+ $this->assertEquals([1], $property->getParts());
$this->assertEquals(1, $property->getValue());
- $property->setValue(array(1,2));
- $this->assertEquals(array(1,2), $property->getParts());
+ $property->setValue([1, 2]);
+ $this->assertEquals([1, 2], $property->getParts());
$this->assertEquals('1,2', $property->getValue());
$property->setValue('str');
- $this->assertEquals(array('str'), $property->getParts());
+ $this->assertEquals(['str'], $property->getParts());
$this->assertEquals('str', $property->getValue());
}
@@ -360,7 +359,7 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testValidateBadEncoding() {
$document = new VCalendar();
- $property = $document->add('X-FOO','value');
+ $property = $document->add('X-FOO', 'value');
$property['ENCODING'] = 'invalid';
$result = $property->validate();
@@ -372,8 +371,8 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testValidateBadEncodingVCard4() {
- $document = new VCard(array('VERSION' => '4.0'));
- $property = $document->add('X-FOO','value');
+ $document = new VCard(['VERSION' => '4.0']);
+ $property = $document->add('X-FOO', 'value');
$property['ENCODING'] = 'BASE64';
$result = $property->validate();
@@ -385,8 +384,8 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testValidateBadEncodingVCard3() {
- $document = new VCard(array('VERSION' => '3.0'));
- $property = $document->add('X-FOO','value');
+ $document = new VCard(['VERSION' => '3.0']);
+ $property = $document->add('X-FOO', 'value');
$property['ENCODING'] = 'BASE64';
$result = $property->validate();
@@ -398,8 +397,8 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
function testValidateBadEncodingVCard21() {
- $document = new VCard(array('VERSION' => '2.1'));
- $property = $document->add('X-FOO','value');
+ $document = new VCard(['VERSION' => '2.1']);
+ $property = $document->add('X-FOO', 'value');
$property['ENCODING'] = 'B';
$result = $property->validate();
diff --git a/tests/VObject/ReaderTest.php b/tests/VObject/ReaderTest.php
index 3bdda95..6124208 100644
--- a/tests/VObject/ReaderTest.php
+++ b/tests/VObject/ReaderTest.php
@@ -138,13 +138,13 @@ class ReaderTest extends \PHPUnit_Framework_TestCase {
function testReadPropertyInComponent() {
- $data = array(
+ $data = [
"BEGIN:VCALENDAR",
"PROPNAME:propValue",
"END:VCALENDAR"
- );
+ ];
- $result = Reader::read(implode("\r\n",$data));
+ $result = Reader::read(implode("\r\n", $data));
$this->assertInstanceOf('Sabre\\VObject\\Component', $result);
$this->assertEquals('VCALENDAR', $result->name);
@@ -157,16 +157,16 @@ class ReaderTest extends \PHPUnit_Framework_TestCase {
function testReadNestedComponent() {
- $data = array(
+ $data = [
"BEGIN:VCALENDAR",
"BEGIN:VTIMEZONE",
"BEGIN:DAYLIGHT",
"END:DAYLIGHT",
"END:VTIMEZONE",
"END:VCALENDAR"
- );
+ ];
- $result = Reader::read(implode("\r\n",$data));
+ $result = Reader::read(implode("\r\n", $data));
$this->assertInstanceOf('Sabre\\VObject\\Component', $result);
$this->assertEquals('VCALENDAR', $result->name);
@@ -209,7 +209,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(1, count($result->parameters()));
$this->assertEquals('N', $result->parameters['N']->name);
$this->assertEquals('1,2,3,4,5,6,7,8,9,10,"11"', $result->parameters['N']->getValue());
- $this->assertEquals(array(1,2,3,4,5,6,"7,8",9,10,'"11"'), $result->parameters['N']->getParts());
+ $this->assertEquals([1, 2, 3, 4, 5, 6, "7,8", 9, 10, '"11"'], $result->parameters['N']->getParts());
}
@@ -226,7 +226,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(1, count($result->parameters()));
$this->assertEquals('TYPE', $result->parameters['TYPE']->name);
$this->assertEquals('WORK,VOICE,PREF', $result->parameters['TYPE']->getValue());
- $this->assertEquals(array('WORK', 'VOICE', 'PREF'), $result->parameters['TYPE']->getParts());
+ $this->assertEquals(['WORK', 'VOICE', 'PREF'], $result->parameters['TYPE']->getParts());
}
@@ -331,29 +331,29 @@ class ReaderTest extends \PHPUnit_Framework_TestCase {
function testReadForgiving() {
- $data = array(
+ $data = [
"BEGIN:VCALENDAR",
"X_PROP:propValue",
"END:VCALENDAR"
- );
+ ];
$caught = false;
try {
- $result = Reader::read(implode("\r\n",$data));
+ $result = Reader::read(implode("\r\n", $data));
} catch (ParseException $e) {
$caught = true;
}
$this->assertEquals(true, $caught);
- $result = Reader::read(implode("\r\n",$data), Reader::OPTION_FORGIVING);
+ $result = Reader::read(implode("\r\n", $data), Reader::OPTION_FORGIVING);
- $expected = implode("\r\n", array(
+ $expected = implode("\r\n", [
"BEGIN:VCALENDAR",
"X_PROP:propValue",
"END:VCALENDAR",
""
- ));
+ ]);
$this->assertEquals($expected, $result->serialize());
@@ -361,30 +361,30 @@ class ReaderTest extends \PHPUnit_Framework_TestCase {
function testReadWithInvalidLine() {
- $data = array(
+ $data = [
"BEGIN:VCALENDAR",
"DESCRIPTION:propValue",
"Yes, we've actually seen a file with non-idented property values on multiple lines",
"END:VCALENDAR"
- );
+ ];
$caught = false;
try {
- $result = Reader::read(implode("\r\n",$data));
+ $result = Reader::read(implode("\r\n", $data));
} catch (ParseException $e) {
$caught = true;
}
$this->assertEquals(true, $caught);
- $result = Reader::read(implode("\r\n",$data), Reader::OPTION_IGNORE_INVALID_LINES);
+ $result = Reader::read(implode("\r\n", $data), Reader::OPTION_IGNORE_INVALID_LINES);
- $expected = implode("\r\n", array(
+ $expected = implode("\r\n", [
"BEGIN:VCALENDAR",
"DESCRIPTION:propValue",
"END:VCALENDAR",
""
- ));
+ ]);
$this->assertEquals($expected, $result->serialize());
diff --git a/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php b/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
index 4f3f852..7fa7fae 100644
--- a/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
+++ b/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
@@ -2,9 +2,8 @@
namespace Sabre\VObject\Recur;
-use
- Sabre\VObject\Reader,
- DateTime;
+use Sabre\VObject\Reader;
+use DateTime;
class ByMonthInDailyTest extends \PHPUnit_Framework_TestCase {
@@ -44,14 +43,14 @@ ICS;
$dates[] = $event->DTSTART->getValue();
}
- $expectedDates = array(
+ $expectedDates = [
"20130929T160000Z",
"20131006T160000Z",
"20131013T160000Z",
"20131020T160000Z",
"20131027T160000Z",
"20140907T160000Z"
- );
+ ];
$this->assertEquals($expectedDates, $dates, 'Recursed dates are restricted by month');
}
diff --git a/tests/VObject/Recur/EventIterator/BySetPosHangTest.php b/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
index bf346a5..84a439b 100644
--- a/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
+++ b/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
@@ -2,9 +2,8 @@
namespace Sabre\VObject\Recur;
-use
- Sabre\VObject\Reader,
- DateTime;
+use Sabre\VObject\Reader;
+use DateTime;
class BySetPosHangTest extends \PHPUnit_Framework_TestCase {
@@ -39,7 +38,7 @@ ICS;
$dates[] = $event->DTSTART->getValue();
}
- $expectedDates = array(
+ $expectedDates = [
"20150101T160000Z",
"20150122T160000Z",
"20150219T160000Z",
@@ -53,7 +52,7 @@ ICS;
"20151022T150000Z",
"20151119T160000Z",
"20151224T160000Z",
- );
+ ];
$this->assertEquals($expectedDates, $dates);
}
diff --git a/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php b/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php
index 05c4fcd..f390a83 100644
--- a/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php
+++ b/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php
@@ -2,9 +2,7 @@
namespace Sabre\VObject;
-use
- DateTime,
- DateTimeZone;
+use DateTime;
class ExpandFloatingTimesTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php b/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php
index c1546a0..36b1ba0 100644
--- a/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php
+++ b/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php
@@ -40,7 +40,7 @@ ICS;
$vObject = Reader::read($ics);
$it = new Recur\EventIterator($vObject, (string)$vObject->VEVENT->UID);
- while($it->valid()) {
+ while ($it->valid()) {
$it->next();
}
diff --git a/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php b/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php
index d6c93d0..fdd1f30 100644
--- a/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php
+++ b/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php
@@ -2,14 +2,12 @@
namespace Sabre\VObject;
-use
- DateTime,
- DateTimeZone;
+use DateTime;
/**
* This is a unittest for Issue #53.
*/
-class RecurrenceIteratorIncorrectExpandTest extends \PHPUnit_Framework_TestCase {
+class IncorrectExpandTest extends \PHPUnit_Framework_TestCase {
function testExpand() {
diff --git a/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php b/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php
index 667247d..d3de196 100644
--- a/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php
+++ b/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php
@@ -2,15 +2,14 @@
namespace Sabre\VObject\Recur\EventIterator;
-use
- DateTimeImmutable,
- DateTimeZone,
- Sabre\VObject\Component\VCalendar,
- Sabre\VObject\Recur;
+use DateTimeImmutable;
+use DateTimeZone;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Recur;
-class EventIteratorInfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
+class InfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
- public function setUp() {
+ function setUp() {
$this->vcal = new VCalendar();
@@ -27,7 +26,7 @@ class EventIteratorInfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
$ev->DTSTART = '20090420T180000Z';
$ev->RRULE = 'FREQ=WEEKLY;BYDAY=MO;UNTIL=20090704T205959Z;INTERVAL=1';
- $this->assertFalse($ev->isInTimeRange(new DateTimeImmutable('2012-01-01 12:00:00'),new DateTimeImmutable('3000-01-01 00:00:00')));
+ $this->assertFalse($ev->isInTimeRange(new DateTimeImmutable('2012-01-01 12:00:00'), new DateTimeImmutable('3000-01-01 00:00:00')));
}
@@ -52,12 +51,12 @@ class EventIteratorInfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
// way to specify this, and could have certainly been a lot easier.
$this->vcal->add($ev);
- $it = new Recur\EventIterator($this->vcal,'uuid');
+ $it = new Recur\EventIterator($this->vcal, 'uuid');
$it->fastForward(new DateTimeImmutable('2012-01-29 23:00:00', new DateTimeZone('UTC')));
- $collect = array();
+ $collect = [];
- while($it->valid()) {
+ while ($it->valid()) {
$collect[] = $it->getDTSTART();
if ($it->getDTSTART() > new DateTimeImmutable('2013-02-05 22:59:59', new DateTimeZone('UTC'))) {
break;
@@ -67,7 +66,7 @@ class EventIteratorInfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
}
$this->assertEquals(
- array(new DateTimeImmutable('2012-02-01 15:45:00', new DateTimeZone('Europe/Berlin'))),
+ [new DateTimeImmutable('2012-02-01 15:45:00', new DateTimeZone('Europe/Berlin'))],
$collect
);
@@ -89,7 +88,7 @@ class EventIteratorInfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
$ev->RRULE = 'FREQ=YEARLY;INTERVAL=0';
$this->vcal->add($ev);
- $it = new Recur\EventIterator($this->vcal,'uuid');
+ $it = new Recur\EventIterator($this->vcal, 'uuid');
$it->fastForward(new DateTimeImmutable('2013-01-01 23:00:00', new DateTimeZone('UTC')));
// if we got this far.. it means we are no longer infinitely looping
diff --git a/tests/VObject/Recur/EventIterator/Issue48Test.php b/tests/VObject/Recur/EventIterator/Issue48Test.php
index 30e6d33..179da81 100644
--- a/tests/VObject/Recur/EventIterator/Issue48Test.php
+++ b/tests/VObject/Recur/EventIterator/Issue48Test.php
@@ -2,9 +2,8 @@
namespace Sabre\VObject;
-use
- DateTimeImmutable,
- DateTimeZone;
+use DateTimeImmutable;
+use DateTimeZone;
class Issue48Test extends \PHPUnit_Framework_TestCase {
@@ -36,11 +35,11 @@ ICS;
$tz = new DateTimeZone('Europe/Moscow');
- $expected = array(
+ $expected = [
new DateTimeImmutable('2013-07-10 11:00:00', $tz),
new DateTimeImmutable('2013-07-12 11:00:00', $tz),
new DateTimeImmutable('2013-07-13 11:00:00', $tz),
- );
+ ];
$this->assertEquals($expected, $result);
diff --git a/tests/VObject/Recur/EventIterator/Issue50Test.php b/tests/VObject/Recur/EventIterator/Issue50Test.php
index ab6511b..193bdd8 100644
--- a/tests/VObject/Recur/EventIterator/Issue50Test.php
+++ b/tests/VObject/Recur/EventIterator/Issue50Test.php
@@ -2,9 +2,8 @@
namespace Sabre\VObject;
-use
- DateTimeImmutable,
- DateTimeZone;
+use DateTimeImmutable;
+use DateTimeZone;
class Issue50Test extends \PHPUnit_Framework_TestCase {
@@ -106,8 +105,8 @@ ICS;
$it = new Recur\EventIterator($vcal, '1aef0b27-3d92-4581-829a-11999dd36724');
- $result = array();
- foreach($it as $instance) {
+ $result = [];
+ foreach ($it as $instance) {
$result[] = $instance;
@@ -115,13 +114,13 @@ ICS;
$tz = new DateTimeZone('Europe/Brussels');
- $this->assertEquals(array(
+ $this->assertEquals([
new DateTimeImmutable('2013-07-15 09:00:00', $tz),
new DateTimeImmutable('2013-07-16 07:00:00', $tz),
new DateTimeImmutable('2013-07-17 07:00:00', $tz),
new DateTimeImmutable('2013-07-18 09:00:00', $tz),
new DateTimeImmutable('2013-07-19 07:00:00', $tz),
- ), $result);
+ ], $result);
}
diff --git a/tests/VObject/Recur/EventIterator/MainTest.php b/tests/VObject/Recur/EventIterator/MainTest.php
index 8a0dfd3..f3fee05 100644
--- a/tests/VObject/Recur/EventIterator/MainTest.php
+++ b/tests/VObject/Recur/EventIterator/MainTest.php
@@ -22,7 +22,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$this->assertTrue($it->isInfinite());
@@ -44,7 +44,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$ev->add($dtStart);
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
}
@@ -64,7 +64,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
function testVCalendarInvalidUID() {
$vcal = new VCalendar();
- $it = new EventIterator($vcal,'foo');
+ $it = new EventIterator($vcal, 'foo');
}
@@ -84,12 +84,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$ev->add($dtStart);
$vcal->add($ev);
- $it = new EventIterator($vcal,$ev->uid);
+ $it = new EventIterator($vcal, $ev->uid);
// Max is to prevent overflow
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -101,7 +101,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07 12:00:00', $tz),
new DateTimeImmutable('2011-10-07 15:00:00', $tz),
new DateTimeImmutable('2011-10-07 18:00:00', $tz),
@@ -114,7 +114,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-10-08 15:00:00', $tz),
new DateTimeImmutable('2011-10-08 18:00:00', $tz),
new DateTimeImmutable('2011-10-08 21:00:00', $tz),
- ),
+ ],
$result
);
@@ -137,12 +137,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,$ev->uid);
+ $it = new EventIterator($vcal, $ev->uid);
// Max is to prevent overflow
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -154,7 +154,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07', $tz),
new DateTimeImmutable('2011-10-10', $tz),
new DateTimeImmutable('2011-10-13', $tz),
@@ -162,7 +162,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-10-19', $tz),
new DateTimeImmutable('2011-10-22', $tz),
new DateTimeImmutable('2011-10-25', $tz),
- ),
+ ],
$result
);
@@ -184,12 +184,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,$ev->uid);
+ $it = new EventIterator($vcal, $ev->uid);
// Max is to prevent overflow
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -201,9 +201,9 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07', $tz),
- ),
+ ],
$result
);
@@ -226,12 +226,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Grabbing the next 12 items
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -243,7 +243,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-08 06:00:00', $tz),
new DateTimeImmutable('2011-10-08 07:00:00', $tz),
new DateTimeImmutable('2011-10-09 06:00:00', $tz),
@@ -256,7 +256,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-10-22 07:00:00', $tz),
new DateTimeImmutable('2011-10-23 06:00:00', $tz),
new DateTimeImmutable('2011-10-23 07:00:00', $tz),
- ),
+ ],
$result
);
@@ -279,12 +279,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Grabbing the next 12 items
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -296,7 +296,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2012-10-11 12:00:00', $tz),
new DateTimeImmutable('2012-10-11 13:00:00', $tz),
new DateTimeImmutable('2012-10-11 14:00:00', $tz),
@@ -309,7 +309,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2012-10-13 15:00:00', $tz),
new DateTimeImmutable('2012-10-15 10:00:00', $tz),
new DateTimeImmutable('2012-10-15 11:00:00', $tz),
- ),
+ ],
$result
);
@@ -332,12 +332,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Grabbing the next 12 items
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -349,7 +349,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07', $tz),
new DateTimeImmutable('2011-10-11', $tz),
new DateTimeImmutable('2011-10-19', $tz),
@@ -362,7 +362,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-11-18', $tz),
new DateTimeImmutable('2011-11-22', $tz),
new DateTimeImmutable('2011-11-30', $tz),
- ),
+ ],
$result
);
@@ -385,12 +385,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Max is to prevent overflow
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -402,7 +402,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07', $tz),
new DateTimeImmutable('2011-10-21', $tz),
new DateTimeImmutable('2011-11-04', $tz),
@@ -413,7 +413,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2012-01-13', $tz),
new DateTimeImmutable('2012-01-27', $tz),
new DateTimeImmutable('2012-02-10', $tz),
- ),
+ ],
$result
);
@@ -436,12 +436,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Grabbing the next 12 items
$max = 15;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -453,7 +453,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07 08:00:00', $tz),
new DateTimeImmutable('2011-10-07 09:00:00', $tz),
new DateTimeImmutable('2011-10-07 10:00:00', $tz),
@@ -469,7 +469,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-11-01 08:00:00', $tz),
new DateTimeImmutable('2011-11-01 09:00:00', $tz),
new DateTimeImmutable('2011-11-01 10:00:00', $tz),
- ),
+ ],
$result
);
@@ -492,12 +492,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Grabbing the next 12 items
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -509,7 +509,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07 18:00:00', $tz),
new DateTimeImmutable('2011-10-18 18:00:00', $tz),
new DateTimeImmutable('2011-10-19 18:00:00', $tz),
@@ -522,7 +522,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-11-18 18:00:00', $tz),
new DateTimeImmutable('2011-11-29 18:00:00', $tz),
new DateTimeImmutable('2011-11-30 18:00:00', $tz),
- ),
+ ],
$result
);
@@ -545,12 +545,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// Grabbing the next 12 items
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -562,7 +562,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07', $tz),
new DateTimeImmutable('2011-10-18', $tz),
new DateTimeImmutable('2011-10-19', $tz),
@@ -575,7 +575,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-11-18', $tz),
new DateTimeImmutable('2011-11-29', $tz),
new DateTimeImmutable('2011-11-30', $tz),
- ),
+ ],
$result
);
@@ -598,11 +598,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 14;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -614,13 +614,13 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-12-05', $tz),
new DateTimeImmutable('2012-03-05', $tz),
new DateTimeImmutable('2012-06-05', $tz),
new DateTimeImmutable('2012-09-05', $tz),
new DateTimeImmutable('2012-12-05', $tz),
- ),
+ ],
$result
);
@@ -644,11 +644,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 14;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -660,7 +660,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-12-31', $tz),
new DateTimeImmutable('2012-08-31', $tz),
new DateTimeImmutable('2012-10-31', $tz),
@@ -673,7 +673,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2014-12-31', $tz),
new DateTimeImmutable('2015-08-31', $tz),
new DateTimeImmutable('2015-10-31', $tz),
- ),
+ ],
$result
);
@@ -697,11 +697,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 14;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -713,7 +713,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-01-01', $tz),
new DateTimeImmutable('2011-01-25', $tz),
new DateTimeImmutable('2011-01-31', $tz),
@@ -723,7 +723,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-11-24', $tz),
new DateTimeImmutable('2012-04-01', $tz),
new DateTimeImmutable('2012-04-24', $tz),
- ),
+ ],
$result
);
@@ -750,11 +750,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -766,7 +766,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-01-03', $tz),
new DateTimeImmutable('2011-01-05', $tz),
new DateTimeImmutable('2011-01-10', $tz),
@@ -783,7 +783,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-03-22', $tz),
new DateTimeImmutable('2011-03-28', $tz),
new DateTimeImmutable('2011-05-02', $tz),
- ),
+ ],
$result
);
@@ -806,11 +806,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -822,7 +822,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-08-01', $tz),
new DateTimeImmutable('2012-10-01', $tz),
new DateTimeImmutable('2013-04-01', $tz),
@@ -833,7 +833,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2016-02-01', $tz),
new DateTimeImmutable('2016-08-01', $tz),
new DateTimeImmutable('2017-05-01', $tz),
- ),
+ ],
$result
);
@@ -856,11 +856,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -872,7 +872,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-01-03', $tz),
new DateTimeImmutable('2011-01-31', $tz),
new DateTimeImmutable('2011-02-01', $tz),
@@ -883,7 +883,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2011-04-29', $tz),
new DateTimeImmutable('2011-05-02', $tz),
new DateTimeImmutable('2011-05-31', $tz),
- ),
+ ],
$result
);
@@ -906,11 +906,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -922,7 +922,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-01-01', $tz),
new DateTimeImmutable('2014-01-01', $tz),
new DateTimeImmutable('2017-01-01', $tz),
@@ -933,7 +933,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2032-01-01', $tz),
new DateTimeImmutable('2035-01-01', $tz),
new DateTimeImmutable('2038-01-01', $tz),
- ),
+ ],
$result
);
@@ -956,11 +956,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -972,11 +972,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2012-02-29', $tz),
new DateTimeImmutable('2016-02-29', $tz),
new DateTimeImmutable('2020-02-29', $tz),
- ),
+ ],
$result
);
@@ -999,11 +999,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -1015,7 +1015,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-04-07', $tz),
new DateTimeImmutable('2011-10-07', $tz),
new DateTimeImmutable('2015-04-07', $tz),
@@ -1024,7 +1024,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2019-10-07', $tz),
new DateTimeImmutable('2023-04-07', $tz),
new DateTimeImmutable('2023-10-07', $tz),
- ),
+ ],
$result
);
@@ -1047,11 +1047,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -1063,7 +1063,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-04-04', $tz),
new DateTimeImmutable('2011-04-24', $tz),
new DateTimeImmutable('2011-10-03', $tz),
@@ -1072,7 +1072,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2016-04-24', $tz),
new DateTimeImmutable('2016-10-03', $tz),
new DateTimeImmutable('2016-10-30', $tz),
- ),
+ ],
$result
);
@@ -1095,15 +1095,15 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
// The idea is that we're fast-forwarding too far in the future, so
// there will be no results left.
$it->fastForward(new DateTimeImmutable('2020-05-05', new DateTimeZone('UTC')));
$max = 20;
- $result = array();
- while($item = $it->current()) {
+ $result = [];
+ while ($item = $it->current()) {
$result[] = $item;
$max--;
@@ -1114,7 +1114,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
}
$tz = new DateTimeZone('UTC');
- $this->assertEquals(array(), $result);
+ $this->assertEquals([], $result);
}
@@ -1134,9 +1134,9 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$dtStart->setDateTime(new DateTimeImmutable('2011-01-01 13:50:20', $tz));
$exDate1 = $vcal->createProperty('EXDATE');
- $exDate1->setDateTimes(array(new DateTimeImmutable('2012-01-01 13:50:20', $tz), new DateTimeImmutable('2014-01-01 13:50:20', $tz)));
+ $exDate1->setDateTimes([new DateTimeImmutable('2012-01-01 13:50:20', $tz), new DateTimeImmutable('2014-01-01 13:50:20', $tz)]);
$exDate2 = $vcal->createProperty('EXDATE');
- $exDate2->setDateTimes(array(new DateTimeImmutable('2016-01-01 13:50:20', $tz)));
+ $exDate2->setDateTimes([new DateTimeImmutable('2016-01-01 13:50:20', $tz)]);
$ev->add($dtStart);
$ev->add($exDate1);
@@ -1144,11 +1144,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,(string)$ev->uid);
+ $it = new EventIterator($vcal, (string)$ev->uid);
$max = 20;
- $result = array();
- foreach($it as $k=>$item) {
+ $result = [];
+ foreach ($it as $k => $item) {
$result[] = $item;
$max--;
@@ -1158,7 +1158,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
}
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-01-01 13:50:20', $tz),
new DateTimeImmutable('2013-01-01 13:50:20', $tz),
new DateTimeImmutable('2015-01-01 13:50:20', $tz),
@@ -1166,7 +1166,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
new DateTimeImmutable('2018-01-01 13:50:20', $tz),
new DateTimeImmutable('2019-01-01 13:50:20', $tz),
new DateTimeImmutable('2020-01-01 13:50:20', $tz),
- ),
+ ],
$result
);
@@ -1205,11 +1205,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev3);
- $it = new EventIterator($vcal,'overridden');
+ $it = new EventIterator($vcal, 'overridden');
- $dates = array();
- $summaries = array();
- while($it->valid()) {
+ $dates = [];
+ $summaries = [];
+ while ($it->valid()) {
$dates[] = $it->getDTStart();
$summaries[] = (string)$it->getEventObject()->SUMMARY;
@@ -1218,20 +1218,20 @@ class MainTest extends \PHPUnit_Framework_TestCase {
}
$tz = new DateTimeZone('UTC');
- $this->assertEquals(array(
- new DateTimeImmutable('2012-01-07 12:00:00',$tz),
- new DateTimeImmutable('2012-01-08 12:00:00',$tz),
- new DateTimeImmutable('2012-01-09 12:00:00',$tz),
- new DateTimeImmutable('2012-01-10 14:00:00',$tz),
- new DateTimeImmutable('2012-01-11 12:00:00',$tz),
- new DateTimeImmutable('2012-01-12 12:00:00',$tz),
- new DateTimeImmutable('2012-01-14 12:00:00',$tz),
- new DateTimeImmutable('2012-01-15 12:00:00',$tz),
- new DateTimeImmutable('2012-01-15 14:00:00',$tz),
- new DateTimeImmutable('2012-01-16 12:00:00',$tz),
- ), $dates);
-
- $this->assertEquals(array(
+ $this->assertEquals([
+ new DateTimeImmutable('2012-01-07 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-08 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-09 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-10 14:00:00', $tz),
+ new DateTimeImmutable('2012-01-11 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-12 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-14 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-15 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-15 14:00:00', $tz),
+ new DateTimeImmutable('2012-01-16 12:00:00', $tz),
+ ], $dates);
+
+ $this->assertEquals([
'baseEvent',
'baseEvent',
'baseEvent',
@@ -1242,7 +1242,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
'baseEvent',
'Event 3',
'baseEvent',
- ), $summaries);
+ ], $summaries);
}
@@ -1270,11 +1270,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev2);
- $it = new EventIterator($vcal,'overridden');
+ $it = new EventIterator($vcal, 'overridden');
- $dates = array();
- $summaries = array();
- while($it->valid()) {
+ $dates = [];
+ $summaries = [];
+ while ($it->valid()) {
$dates[] = $it->getDTStart();
$summaries[] = (string)$it->getEventObject()->SUMMARY;
@@ -1283,18 +1283,18 @@ class MainTest extends \PHPUnit_Framework_TestCase {
}
$tz = new DateTimeZone('UTC');
- $this->assertEquals(array(
- new DateTimeImmutable('2012-01-12 12:00:00',$tz),
- new DateTimeImmutable('2012-01-13 12:00:00',$tz),
- new DateTimeImmutable('2012-01-26 12:00:00',$tz),
+ $this->assertEquals([
+ new DateTimeImmutable('2012-01-12 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-13 12:00:00', $tz),
+ new DateTimeImmutable('2012-01-26 12:00:00', $tz),
- ), $dates);
+ ], $dates);
- $this->assertEquals(array(
+ $this->assertEquals([
'baseEvent',
'Override!',
'baseEvent',
- ), $summaries);
+ ], $summaries);
}
@@ -1322,10 +1322,10 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev2);
- $it = new EventIterator($vcal,'overridden');
+ $it = new EventIterator($vcal, 'overridden');
- $dates = array();
- $summaries = array();
+ $dates = [];
+ $summaries = [];
// The reported problem was specifically related to the VCALENDAR
// expansion. In this parcitular case, we had to forward to the 28th of
@@ -1335,7 +1335,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
// We stop the loop when it hits the 6th of februari. Normally this
// iterator would hit 24, 25 (overriden from 31) and 7 feb but because
// we 'filter' from the 28th till the 6th, we should get 0 results.
- while($it->valid() && $it->getDTSTart() < new DateTimeImmutable('2012-02-06 23:00:00')) {
+ while ($it->valid() && $it->getDTSTart() < new DateTimeImmutable('2012-02-06 23:00:00')) {
$dates[] = $it->getDTStart();
$summaries[] = (string)$it->getEventObject()->SUMMARY;
@@ -1343,8 +1343,8 @@ class MainTest extends \PHPUnit_Framework_TestCase {
}
- $this->assertEquals(array(), $dates);
- $this->assertEquals(array(), $summaries);
+ $this->assertEquals([], $dates);
+ $this->assertEquals([], $summaries);
}
@@ -1357,10 +1357,10 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$ev = $vcal->createComponent('VEVENT');
$ev->UID = 'bla';
- $ev->RDATE = array(
+ $ev->RDATE = [
new DateTimeImmutable('2014-08-07', new DateTimeZone('UTC')),
new DateTimeImmutable('2014-08-08', new DateTimeZone('UTC')),
- );
+ ];
$dtStart = $vcal->createProperty('DTSTART');
$dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
@@ -1368,12 +1368,12 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev);
- $it = new EventIterator($vcal,$ev->uid);
+ $it = new EventIterator($vcal, $ev->uid);
// Max is to prevent overflow
$max = 12;
- $result = array();
- foreach($it as $item) {
+ $result = [];
+ foreach ($it as $item) {
$result[] = $item;
$max--;
@@ -1385,11 +1385,11 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$tz = new DateTimeZone('UTC');
$this->assertEquals(
- array(
+ [
new DateTimeImmutable('2011-10-07', $tz),
new DateTimeImmutable('2014-08-07', $tz),
new DateTimeImmutable('2014-08-08', $tz),
- ),
+ ],
$result
);
@@ -1420,8 +1420,7 @@ class MainTest extends \PHPUnit_Framework_TestCase {
$vcal->add($ev3);
- $it = new EventIterator($vcal,'broken');
+ $it = new EventIterator($vcal, 'broken');
}
}
-
diff --git a/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php b/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php
index 1de517b..ed3efbd 100644
--- a/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php
+++ b/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php
@@ -2,11 +2,9 @@
namespace Sabre\VObject;
-use
- DateTime,
- DateTimeZone;
+use DateTime;
-class RecurrenceIteratorMissingOverriddenTest extends \PHPUnit_Framework_TestCase {
+class MissingOverriddenTest extends \PHPUnit_Framework_TestCase {
function testExpand() {
@@ -56,7 +54,7 @@ END:VEVENT
END:VCALENDAR
ICS;
- $this->assertEquals($output, str_replace("\r","",$result));
+ $this->assertEquals($output, str_replace("\r", "", $result));
}
diff --git a/tests/VObject/Recur/EventIterator/NoInstancesTest.php b/tests/VObject/Recur/EventIterator/NoInstancesTest.php
index 81c8ac9..84c7ec1 100644
--- a/tests/VObject/Recur/EventIterator/NoInstancesTest.php
+++ b/tests/VObject/Recur/EventIterator/NoInstancesTest.php
@@ -5,7 +5,7 @@ namespace Sabre\VObject\Recur;
use
Sabre\VObject\Reader;
-class IssueEXDATETest extends \PHPUnit_Framework_TestCase {
+class NoInstancesTest extends \PHPUnit_Framework_TestCase {
/**
* @expectedException \Sabre\VObject\Recur\NoInstancesException
diff --git a/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php b/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php
index 5751493..fd691d6 100644
--- a/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php
+++ b/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php
@@ -66,7 +66,7 @@ END:VCALENDAR
ICS;
$newIcs = $vcal->serialize();
- $newIcs = str_replace("\r\n","\n", $newIcs);
+ $newIcs = str_replace("\r\n", "\n", $newIcs);
$this->assertEquals(
$expected,
$newIcs
@@ -111,7 +111,7 @@ END:VCALENDAR
ICS;
$newIcs = $vcal->serialize();
- $newIcs = str_replace("\r\n","\n", $newIcs);
+ $newIcs = str_replace("\r\n", "\n", $newIcs);
$this->assertEquals(
$expected,
$newIcs
diff --git a/tests/VObject/Recur/RDateIteratorTest.php b/tests/VObject/Recur/RDateIteratorTest.php
index 640cb1e..2c9c7f1 100644
--- a/tests/VObject/Recur/RDateIteratorTest.php
+++ b/tests/VObject/Recur/RDateIteratorTest.php
@@ -12,11 +12,11 @@ class RDateIteratorTest extends \PHPUnit_Framework_TestCase {
$utc = new DateTimeZone('UTC');
$it = new RDateIterator('20140901T000000Z,20141001T000000Z', new DateTimeImmutable('2014-08-01 00:00:00', $utc));
- $expected = array(
+ $expected = [
new DateTimeImmutable('2014-08-01 00:00:00', $utc),
new DateTimeImmutable('2014-09-01 00:00:00', $utc),
new DateTimeImmutable('2014-10-01 00:00:00', $utc),
- );
+ ];
$this->assertEquals(
$expected,
@@ -34,16 +34,16 @@ class RDateIteratorTest extends \PHPUnit_Framework_TestCase {
$it->fastForward(new DateTimeImmutable('2014-08-15 00:00:00'));
- $result = array();
- while($it->valid()) {
+ $result = [];
+ while ($it->valid()) {
$result[] = $it->current();
$it->next();
}
- $expected = array(
+ $expected = [
new DateTimeImmutable('2014-09-01 00:00:00', $utc),
new DateTimeImmutable('2014-10-01 00:00:00', $utc),
- );
+ ];
$this->assertEquals(
$expected,
diff --git a/tests/VObject/Recur/RRuleIteratorTest.php b/tests/VObject/Recur/RRuleIteratorTest.php
index 9122934..3b1e6ac 100644
--- a/tests/VObject/Recur/RRuleIteratorTest.php
+++ b/tests/VObject/Recur/RRuleIteratorTest.php
@@ -12,7 +12,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=HOURLY;INTERVAL=3;COUNT=12',
'2011-10-07 12:00:00',
- array(
+ [
'2011-10-07 12:00:00',
'2011-10-07 15:00:00',
'2011-10-07 18:00:00',
@@ -25,7 +25,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-10-08 15:00:00',
'2011-10-08 18:00:00',
'2011-10-08 21:00:00',
- )
+ ]
);
}
@@ -35,7 +35,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;INTERVAL=3;UNTIL=20111025T000000Z',
'2011-10-07',
- array(
+ [
'2011-10-07 00:00:00',
'2011-10-10 00:00:00',
'2011-10-13 00:00:00',
@@ -43,7 +43,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-10-19 00:00:00',
'2011-10-22 00:00:00',
'2011-10-25 00:00:00',
- )
+ ]
);
}
@@ -53,7 +53,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;BYDAY=SA,SU;BYHOUR=6,7',
'2011-10-08 06:00:00',
- array(
+ [
'2011-10-08 06:00:00',
'2011-10-08 07:00:00',
'2011-10-09 06:00:00',
@@ -66,7 +66,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-10-22 07:00:00',
'2011-10-23 06:00:00',
'2011-10-23 07:00:00',
- )
+ ]
);
}
@@ -76,7 +76,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;INTERVAL=2;BYHOUR=10,11,12,13,14,15',
'2012-10-11 12:00:00',
- array(
+ [
'2012-10-11 12:00:00',
'2012-10-11 13:00:00',
'2012-10-11 14:00:00',
@@ -89,7 +89,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2012-10-13 15:00:00',
'2012-10-15 10:00:00',
'2012-10-15 11:00:00',
- )
+ ]
);
}
@@ -99,7 +99,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;INTERVAL=2;BYDAY=TU,WE,FR',
'2011-10-07 12:00:00',
- array(
+ [
'2011-10-07 12:00:00',
'2011-10-11 12:00:00',
'2011-10-19 12:00:00',
@@ -112,7 +112,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-11-18 12:00:00',
'2011-11-22 12:00:00',
'2011-11-30 12:00:00',
- )
+ ]
);
}
@@ -122,13 +122,13 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;COUNT=5',
'2014-08-01 18:03:00',
- array(
+ [
'2014-08-01 18:03:00',
'2014-08-02 18:03:00',
'2014-08-03 18:03:00',
'2014-08-04 18:03:00',
'2014-08-05 18:03:00',
- )
+ ]
);
}
@@ -138,14 +138,14 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;BYMONTH=9,10;BYDAY=SU',
'2007-10-04 16:00:00',
- array(
+ [
"2013-09-29 16:00:00",
"2013-10-06 16:00:00",
"2013-10-13 16:00:00",
"2013-10-20 16:00:00",
"2013-10-27 16:00:00",
"2014-09-07 16:00:00"
- ),
+ ],
'2013-09-28'
);
@@ -156,7 +156,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;INTERVAL=2;COUNT=10',
'2011-10-07 00:00:00',
- array(
+ [
'2011-10-07 00:00:00',
'2011-10-21 00:00:00',
'2011-11-04 00:00:00',
@@ -167,7 +167,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2012-01-13 00:00:00',
'2012-01-27 00:00:00',
'2012-02-10 00:00:00',
- )
+ ]
);
}
@@ -177,12 +177,12 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;INTERVAL=1;COUNT=4;BYDAY=MO;WKST=SA',
'2014-08-01 00:00:00',
- array(
+ [
'2014-08-01 00:00:00',
'2014-08-04 00:00:00',
'2014-08-11 00:00:00',
'2014-08-18 00:00:00',
- )
+ ]
);
}
@@ -192,7 +192,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU',
'2011-10-07 00:00:00',
- array(
+ [
'2011-10-07 00:00:00',
'2011-10-18 00:00:00',
'2011-10-19 00:00:00',
@@ -205,7 +205,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-11-18 00:00:00',
'2011-11-29 00:00:00',
'2011-11-30 00:00:00',
- )
+ ]
);
}
@@ -215,7 +215,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=MO;BYHOUR=8,9,10',
'2011-10-07 08:00:00',
- array(
+ [
'2011-10-07 08:00:00',
'2011-10-07 09:00:00',
'2011-10-07 10:00:00',
@@ -231,7 +231,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-11-01 08:00:00',
'2011-11-01 09:00:00',
'2011-11-01 10:00:00',
- )
+ ]
);
}
@@ -241,7 +241,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU',
'2011-10-07 18:00:00',
- array(
+ [
'2011-10-07 18:00:00',
'2011-10-18 18:00:00',
'2011-10-19 18:00:00',
@@ -254,7 +254,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-11-18 18:00:00',
'2011-11-29 18:00:00',
'2011-11-30 18:00:00',
- )
+ ]
);
}
@@ -264,13 +264,13 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;INTERVAL=3;COUNT=5',
'2011-12-05 00:00:00',
- array(
+ [
'2011-12-05 00:00:00',
'2012-03-05 00:00:00',
'2012-06-05 00:00:00',
'2012-09-05 00:00:00',
'2012-12-05 00:00:00',
- )
+ ]
);
}
@@ -280,7 +280,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;INTERVAL=2;COUNT=12',
'2011-12-31 00:00:00',
- array(
+ [
'2011-12-31 00:00:00',
'2012-08-31 00:00:00',
'2012-10-31 00:00:00',
@@ -293,7 +293,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2014-12-31 00:00:00',
'2015-08-31 00:00:00',
'2015-10-31 00:00:00',
- )
+ ]
);
}
@@ -303,7 +303,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;INTERVAL=5;COUNT=9;BYMONTHDAY=1,31,-7',
'2011-01-01 00:00:00',
- array(
+ [
'2011-01-01 00:00:00',
'2011-01-25 00:00:00',
'2011-01-31 00:00:00',
@@ -313,7 +313,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-11-24 00:00:00',
'2012-04-01 00:00:00',
'2012-04-24 00:00:00',
- )
+ ]
);
}
@@ -323,7 +323,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;INTERVAL=2;COUNT=16;BYDAY=MO,-2TU,+1WE,3TH',
'2011-01-03 00:00:00',
- array(
+ [
'2011-01-03 00:00:00',
'2011-01-05 00:00:00',
'2011-01-10 00:00:00',
@@ -340,7 +340,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-03-22 00:00:00',
'2011-03-28 00:00:00',
'2011-05-02 00:00:00',
- )
+ ]
);
}
@@ -350,7 +350,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;COUNT=10;BYDAY=MO;BYMONTHDAY=1',
'2011-08-01 00:00:00',
- array(
+ [
'2011-08-01 00:00:00',
'2012-10-01 00:00:00',
'2013-04-01 00:00:00',
@@ -361,7 +361,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2016-02-01 00:00:00',
'2016-08-01 00:00:00',
'2017-05-01 00:00:00',
- )
+ ]
);
}
@@ -371,7 +371,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;COUNT=10;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=1,-1',
'2011-01-03 00:00:00',
- array(
+ [
'2011-01-03 00:00:00',
'2011-01-31 00:00:00',
'2011-02-01 00:00:00',
@@ -382,7 +382,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2011-04-29 00:00:00',
'2011-05-02 00:00:00',
'2011-05-31 00:00:00',
- )
+ ]
);
}
@@ -392,7 +392,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;COUNT=10;INTERVAL=3',
'2011-01-01 00:00:00',
- array(
+ [
'2011-01-01 00:00:00',
'2014-01-01 00:00:00',
'2017-01-01 00:00:00',
@@ -403,7 +403,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2032-01-01 00:00:00',
'2035-01-01 00:00:00',
'2038-01-01 00:00:00',
- )
+ ]
);
}
@@ -412,11 +412,11 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;COUNT=3',
'2012-02-29 00:00:00',
- array(
+ [
'2012-02-29 00:00:00',
'2016-02-29 00:00:00',
'2020-02-29 00:00:00',
- )
+ ]
);
}
@@ -425,7 +425,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;COUNT=8;INTERVAL=4;BYMONTH=4,10',
'2011-04-07 00:00:00',
- array(
+ [
'2011-04-07 00:00:00',
'2011-10-07 00:00:00',
'2015-04-07 00:00:00',
@@ -434,7 +434,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2019-10-07 00:00:00',
'2023-04-07 00:00:00',
'2023-10-07 00:00:00',
- )
+ ]
);
}
@@ -444,7 +444,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU',
'2011-04-04 00:00:00',
- array(
+ [
'2011-04-04 00:00:00',
'2011-04-24 00:00:00',
'2011-10-03 00:00:00',
@@ -453,7 +453,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2016-04-24 00:00:00',
'2016-10-03 00:00:00',
'2016-10-30 00:00:00',
- )
+ ]
);
}
@@ -465,11 +465,11 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU',
'2011-04-04 00:00:00',
- array(),
+ [],
'2020-05-05 00:00:00'
);
- }
+ }
/**
* The bug that was in the
@@ -486,9 +486,9 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;INTERVAL=1;UNTIL=20071030T035959Z;BYDAY=5TU',
'2007-10-04 14:46:42',
- array(
+ [
"2007-10-04 14:46:42",
- )
+ ]
);
}
@@ -502,7 +502,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;BYDAY=MO;UNTIL=20090704T205959Z;INTERVAL=1',
'2009-04-20 18:00:00',
- array(
+ [
'2009-04-20 18:00:00',
'2009-04-27 18:00:00',
'2009-05-04 18:00:00',
@@ -514,7 +514,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2009-06-15 18:00:00',
'2009-06-22 18:00:00',
'2009-06-29 18:00:00',
- )
+ ]
);
}
@@ -527,9 +527,9 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;INTERVAL=1;UNTIL=20120203T225959Z;BYMONTH=2;BYSETPOS=1;BYDAY=SU,MO,TU,WE,TH,FR,SA',
'2012-01-01 15:45:00',
- array(
+ [
'2012-02-01 15:45:00',
- ),
+ ],
'2012-01-29 23:00:00'
);
@@ -548,7 +548,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=YEARLY;INTERVAL=0',
'2012-08-24 14:57:00',
- array(),
+ [],
'2013-01-01 23:00:00'
);
@@ -562,7 +562,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=SMONTHLY;INTERVAL=3;UNTIL=20111025T000000Z',
'2011-10-07',
- array()
+ []
);
}
@@ -575,7 +575,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;INTERVAL=1;COUNT=4;BYDAY=0MO;WKST=SA',
'2014-08-01 00:00:00',
- array()
+ []
);
}
@@ -585,7 +585,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=WEEKLY;UNTIL=20131118T183000',
'2013-09-23 18:30:00',
- array(
+ [
'2013-09-23 18:30:00',
'2013-09-30 18:30:00',
'2013-10-07 18:30:00',
@@ -595,7 +595,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
'2013-11-04 18:30:00',
'2013-11-11 18:30:00',
'2013-11-18 18:30:00',
- ),
+ ],
null,
'America/New_York'
);
@@ -607,9 +607,9 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;UNTIL=20140101T000000Z',
'2014-08-02 00:15:00',
- array(
+ [
'2014-08-02 00:15:00',
- )
+ ]
);
}
@@ -619,10 +619,10 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;BYSECOND=1;BYMINUTE=1;BYYEARDAY=1;BYWEEKNO=1;COUNT=2',
'2014-08-02 00:15:00',
- array(
+ [
'2014-08-02 00:15:00',
'2014-08-03 00:15:00',
- )
+ ]
);
}
@@ -632,12 +632,12 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=MONTHLY;BYDAY=-4TH,-5TH;COUNT=4',
'2015-01-01 00:15:00',
- array(
+ [
'2015-01-01 00:15:00',
'2015-01-08 00:15:00',
'2015-02-05 00:15:00',
'2015-03-05 00:15:00'
- )
+ ]
);
}
@@ -650,7 +650,7 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$this->parse(
'FREQ=DAILY;BYWODAN=1',
'2014-08-02 00:15:00',
- array()
+ []
);
}
@@ -690,8 +690,8 @@ class RRuleIteratorTest extends \PHPUnit_Framework_TestCase {
$parser->fastForward(new DateTime($fastForward));
}
- $result = array();
- while($parser->valid()) {
+ $result = [];
+ while ($parser->valid()) {
$item = $parser->current();
$result[] = $item->format('Y-m-d H:i:s');
diff --git a/tests/VObject/SlashRTest.php b/tests/VObject/SlashRTest.php
index fd4dd78..8e9389d 100644
--- a/tests/VObject/SlashRTest.php
+++ b/tests/VObject/SlashRTest.php
@@ -3,7 +3,7 @@
namespace Sabre\VObject;
/**
- * This issue was pointed out in Issue 55. \r should be stripped completely
+ * This issue was pointed out in Issue 55. \r should be stripped completely
* when encoding property values.
*/
class SlashRTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/VObject/Splitter/ICalendarTest.php b/tests/VObject/Splitter/ICalendarTest.php
index 58a2691..ccbd5c8 100644
--- a/tests/VObject/Splitter/ICalendarTest.php
+++ b/tests/VObject/Splitter/ICalendarTest.php
@@ -14,7 +14,7 @@ class ICalendarTest extends \PHPUnit_Framework_TestCase {
function createStream($data) {
- $stream = fopen('php://memory','r+');
+ $stream = fopen('php://memory', 'r+');
fwrite($stream, $data);
rewind($stream);
return $stream;
@@ -37,10 +37,10 @@ EOT;
$objects = new ICalendar($tempFile);
$return = "";
- while($object=$objects->getNext()) {
+ while ($object = $objects->getNext()) {
$return .= $object->serialize();
}
- $this->assertEquals(array(), VObject\Reader::read($return)->validate());
+ $this->assertEquals([], VObject\Reader::read($return)->validate());
}
/**
@@ -76,10 +76,10 @@ EOT;
$objects = new ICalendar($tempFile);
$return = "";
- while($object=$objects->getNext()) {
+ while ($object = $objects->getNext()) {
$return .= $object->serialize();
}
- $this->assertNull($object=$objects->getNext());
+ $this->assertNull($object = $objects->getNext());
}
/**
@@ -124,7 +124,7 @@ EOT;
$return = "";
$i = 0;
- while($object=$objects->getNext()) {
+ while ($object = $objects->getNext()) {
$expected = <<<EOT
BEGIN:VCALENDAR
@@ -141,7 +141,7 @@ EOT;
$this->assertEquals($expected, $object->serialize());
$i++;
}
- $this->assertEquals(array(), VObject\Reader::read($return)->validate());
+ $this->assertEquals([], VObject\Reader::read($return)->validate());
}
function testICalendarImportEventWithoutUID() {
@@ -163,7 +163,7 @@ EOT;
$objects = new ICalendar($tempFile);
$return = "";
- while($object=$objects->getNext()) {
+ while ($object = $objects->getNext()) {
$return .= $object->serialize();
}
@@ -176,7 +176,7 @@ EOT;
);
$this->fail('Validation errors: ' . implode("\n", $messages));
} else {
- $this->assertEquals(array(), $messages);
+ $this->assertEquals([], $messages);
}
}
@@ -258,7 +258,7 @@ EOT;
$return = "";
$i = 0;
- while($object=$objects->getNext()) {
+ while ($object = $objects->getNext()) {
$expected = <<<EOT
BEGIN:VCALENDAR
@@ -278,7 +278,7 @@ EOT;
}
- $this->assertEquals(array(), VObject\Reader::read($return)->validate());
+ $this->assertEquals([], VObject\Reader::read($return)->validate());
}
function testICalendarImportWithOutVTIMEZONES() {
@@ -314,12 +314,12 @@ EOT;
$objects = new ICalendar($tempFile);
$return = "";
- while($object=$objects->getNext()) {
+ while ($object = $objects->getNext()) {
$return .= $object->serialize();
}
$messages = VObject\Reader::read($return)->validate();
- $this->assertEquals(array(), $messages);
+ $this->assertEquals([], $messages);
}
}
diff --git a/tests/VObject/Splitter/VCardTest.php b/tests/VObject/Splitter/VCardTest.php
index 7fa559d..e19e2d8 100644
--- a/tests/VObject/Splitter/VCardTest.php
+++ b/tests/VObject/Splitter/VCardTest.php
@@ -2,13 +2,11 @@
namespace Sabre\VObject\Splitter;
-use Sabre\VObject;
-
class VCardTest extends \PHPUnit_Framework_TestCase {
function createStream($data) {
- $stream = fopen('php://memory','r+');
+ $stream = fopen('php://memory', 'r+');
fwrite($stream, $data);
rewind($stream);
return $stream;
@@ -26,7 +24,7 @@ EOT;
$objects = new VCard($tempFile);
$count = 0;
- while($objects->getNext()) {
+ while ($objects->getNext()) {
$count++;
}
$this->assertEquals(1, $count);
@@ -64,7 +62,7 @@ EOT;
$splitter = new VCard($tempFile);
- while($object=$splitter->getNext()) {
+ while ($object = $splitter->getNext()) {
}
}
@@ -93,7 +91,7 @@ EOT;
$splitter = new VCard($tempFile);
$count = 0;
- while($object=$splitter->getNext()) {
+ while ($object = $splitter->getNext()) {
$count++;
}
$this->assertEquals(4, $count);
@@ -109,7 +107,7 @@ EOT;
$tempFile = $this->createStream($data);
$objects = new VCard($tempFile);
- $object=$objects->getNext();
+ $object = $objects->getNext();
$this->assertNull($objects->getNext());
@@ -127,7 +125,7 @@ EOT;
$tempFile = $this->createStream($data);
$objects = new VCard($tempFile);
- while($objects->getNext()) { }
+ while ($objects->getNext()) { }
}
@@ -145,7 +143,7 @@ EOT;
$objects = new VCard($tempFile);
$count = 0;
- while($objects->getNext()) {
+ while ($objects->getNext()) {
$count++;
}
$this->assertEquals(2, $count);
@@ -185,7 +183,7 @@ EOT;
$objects = new VCard($tempFile);
$count = 0;
- while($objects->getNext()) {
+ while ($objects->getNext()) {
$count++;
}
diff --git a/tests/VObject/TimeZoneUtilTest.php b/tests/VObject/TimeZoneUtilTest.php
index 9c747e8..f4f0e73 100644
--- a/tests/VObject/TimeZoneUtilTest.php
+++ b/tests/VObject/TimeZoneUtilTest.php
@@ -2,7 +2,7 @@
namespace Sabre\VObject;
-class TimezoneUtilTest extends \PHPUnit_Framework_TestCase {
+class TimeZoneUtilTest extends \PHPUnit_Framework_TestCase {
function setUp() {
@@ -20,7 +20,7 @@ class TimezoneUtilTest extends \PHPUnit_Framework_TestCase {
$tz = new \DateTimeZone($timezoneName);
$this->assertInstanceOf('DateTimeZone', $tz);
} catch (\Exception $e) {
- if (strpos($e->getMessage(), "Unknown or bad timezone")!==false) {
+ if (strpos($e->getMessage(), "Unknown or bad timezone") !== false) {
$this->markTestSkipped($timezoneName . ' is not (yet) supported in this PHP version. Update pecl/timezonedb');
} else {
throw $e;
@@ -37,7 +37,7 @@ class TimezoneUtilTest extends \PHPUnit_Framework_TestCase {
// PHPUNit requires an array of arrays
return array_map(
function($value) {
- return array($value);
+ return [$value];
},
TimeZoneUtil::$map
);
@@ -189,7 +189,7 @@ HI;
// PHPUNit requires an array of arrays
return array_map(
function($value) {
- return array($value);
+ return [$value];
},
\DateTimeZone::listIdentifiers()
);
@@ -201,7 +201,7 @@ HI;
// PHPUNit requires an array of arrays
return array_map(
function($value) {
- return array($value);
+ return [$value];
},
TimeZoneUtil::getIdentifiersBC()
);
diff --git a/tests/VObject/VCardConverterTest.php b/tests/VObject/VCardConverterTest.php
index 9e7b2df..508dcae 100644
--- a/tests/VObject/VCardConverterTest.php
+++ b/tests/VObject/VCardConverterTest.php
@@ -418,10 +418,10 @@ OUT;
list(
$input,
$output
- ) = array(
+ ) = [
$output,
$input
- );
+ ];
$vcard = Reader::read($input);
$vcard = $vcard->convert(Document::VCARD40);
@@ -473,10 +473,10 @@ OUT;
list(
$input,
$output
- ) = array(
+ ) = [
$output,
$input
- );
+ ];
$vcard = Reader::read($input);
$vcard = $vcard->convert(Document::VCARD40);
@@ -524,7 +524,7 @@ END:VCARD
VCF;
- $this->assertEquals($expected, str_replace("\r","", $vcard));
+ $this->assertEquals($expected, str_replace("\r", "", $vcard));
}
diff --git a/tests/VObject/VersionTest.php b/tests/VObject/VersionTest.php
index b3d41b2..956479b 100644
--- a/tests/VObject/VersionTest.php
+++ b/tests/VObject/VersionTest.php
@@ -7,7 +7,7 @@ class VersionTest extends \PHPUnit_Framework_TestCase {
function testString() {
$v = Version::VERSION;
- $this->assertEquals(-1, version_compare('2.0.0',$v));
+ $this->assertEquals(-1, version_compare('2.0.0', $v));
}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a01f8f9..14281e2 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,19 +2,19 @@
date_default_timezone_set('UTC');
-$try = array(
+$try = [
__DIR__ . '/../vendor/autoload.php',
__DIR__ . '/../../../autoload.php',
-);
+];
-foreach($try as $path) {
+foreach ($try as $path) {
if (file_exists($path)) {
$autoLoader = include $path;
break;
}
}
-$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/VObject');
+$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
if (!defined('SABRE_TEMPDIR')) {
define('SABRE_TEMPDIR', __DIR__ . '/temp/');
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list