Added new unit tests

butschster · butschster · commit d47e3d36b7d6 · 2021-08-09T16:39:19.000+03:00
- fixed some class names
- fixed psalm errors
diff --git a/README.md b/README.md
@@ -202,6 +202,7 @@ echo $generator->set(new \Butschster\CronExpression\Parts\Days\LastDayOfMonth())
 ```
 
 ### Manipulate days of week
+
 ```php
 // Every week on monday
 echo $generator->weekly(); // 0 0 * * 0
@@ -262,10 +263,10 @@ echo $generator->weeklyOn(Generator::MONDAY, 8); // 0 8 * * 1
 echo $generator->weeklyOn(Generator::MONDAY, 8, 6); // 6 8 * * 1
 
 // Every day of a week
-echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\EveryDaysOfWeek()); // * * * * *
+echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\EveryDayOfWeek()); // * * * * *
 
 // Every two days of a week
-echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\EveryDaysOfWeek(2)); // * * * * */2
+echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\EveryDayOfWeek(2)); // * * * * */2
 
 
 // Every Monday,Wednesday, Friday
@@ -275,10 +276,10 @@ echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\SpecificDay
 echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\BetweenDayOfWeek(Generator::MONDAY, Generator::FRIDAY)); // * * * * 1-5
 
 // Last monday of a week
-echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\LastDayOwWeek()); // * * * * 1L
+echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\LastDayOfWeek()); // * * * * 1L
 
 // Last friday of a week
-echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\LastDayOwWeek(Generator::FRIDAY)); // * * * * 5L
+echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\LastDayOfWeek(Generator::FRIDAY)); // * * * * 5L
 
 // Every first monday of every month
 echo $generator->set(new \Butschster\CronExpression\Parts\DaysOfWeek\NthDayOfWeek()); // * * * * 1#1
diff --git a/psalm.xml b/psalm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedVariablesAndParams="true"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/src/Generator.php b/src/Generator.php
@@ -86,10 +86,10 @@ public function __toString(): string
 
     public function toExpression(): string
     {
-        return $this->getExpression()->getExpression();
+        return (string) $this->getExpression()->getExpression();
     }
 
-    public function setExpresion(CronExpression $expression): self
+    public function setExpression(CronExpression $expression): self
     {
         $this->expression = $expression;
 
diff --git a/src/Parts/DaysOfWeek/EveryDayOfWeek.php b/src/Parts/DaysOfWeek/EveryDayOfWeek.php
@@ -6,7 +6,7 @@
 
 use Butschster\CronExpression\Parts\Every;
 
-class EveryDaysOfWeek extends Every
+class EveryDayOfWeek extends Every
 {
     use DaysOfWeekIndex;
 }
diff --git a/src/Parts/DaysOfWeek/LastDayOfWeek.php b/src/Parts/DaysOfWeek/LastDayOfWeek.php
@@ -8,7 +8,7 @@
 use Butschster\CronExpression\PartValueInterface;
 use Cron\CronExpression;
 
-class LastDayOwWeek implements PartValueInterface
+class LastDayOfWeek implements PartValueInterface
 {
     public function __construct(private int $dayOfWeek = Generator::MONDAY)
     {
diff --git a/src/Traits/Days.php b/src/Traits/Days.php
@@ -26,12 +26,12 @@ public function dailyAt(int $hour, int $minute = 0): self
         );
     }
 
-    public function twiceDaily($first = 1, $second = 13): self
+    public function twiceDaily(int $first = 1, int $second = 13): self
     {
         return $this->daily($first, $second);
     }
 
-    public function twiceDailyAt($first = 1, $second = 13, $minute = 0): self
+    public function twiceDailyAt(int $first = 1, int $second = 13, int $minute = 0): self
     {
         return $this->daily($first, $second)->set(new SpecificMinutes($minute));
     }
diff --git a/src/Traits/Months.php b/src/Traits/Months.php
@@ -5,7 +5,7 @@
 namespace Butschster\CronExpression\Traits;
 
 use Butschster\CronExpression\Parts\Days\SpecificDays;
-use Butschster\CronExpression\Parts\DaysOfWeek\LastDayOwWeek;
+use Butschster\CronExpression\Parts\DaysOfWeek\LastDayOfWeek;
 use Butschster\CronExpression\Parts\DaysOfWeek\NthDayOfWeek;
 
 trait Months
@@ -36,7 +36,7 @@ public function twiceMonthly(int $first = 1, int $second = 16, int $hour = 0, in
 
     public function lastDayOfWeekEveryMonth(int $dayOfWeek = self::MONDAY, int $hour = 0, int $minute = 0): self
     {
-        return $this->dailyAt($hour, $minute)->set(new LastDayOwWeek($dayOfWeek));
+        return $this->dailyAt($hour, $minute)->set(new LastDayOfWeek($dayOfWeek));
     }
 
     public function nthDayOfWeekEveryMonth(int $dayOfWeek = self::MONDAY, int $nth = 1, int $hour = 0, int $minute = 0): self
diff --git a/tests/Parts/Days/BetweenDaysTest.php b/tests/Parts/Days/BetweenDaysTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Days;
+
+use Butschster\CronExpression\Parts\Days\BetweenDays;
+use Butschster\CronExpression\Tests\TestCase;
+
+class BetweenDaysTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * 6-12 * *', new BetweenDays(6, 12));
+    }
+}
diff --git a/tests/Parts/Days/EveryDayTest.php b/tests/Parts/Days/EveryDayTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Days;
+
+use Butschster\CronExpression\Parts\Days\EveryDay;
+use Butschster\CronExpression\Tests\TestCase;
+
+class EveryDayTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * */3 * *', new EveryDay(3));
+    }
+
+    public function testUpdatesExpressionWithoutArgs()
+    {
+        $this->assertExpressionPart('* * * * *', new EveryDay());
+    }
+}
diff --git a/tests/Parts/Days/LastDayOfMonthTest.php b/tests/Parts/Days/LastDayOfMonthTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Days;
+
+use Butschster\CronExpression\Parts\Days\LastDayOfMonth;
+use Butschster\CronExpression\Tests\TestCase;
+
+class LastDayOfMonthTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * L * *', new LastDayOfMonth());
+    }
+}
diff --git a/tests/Parts/Days/LastWeekdayTest.php b/tests/Parts/Days/LastWeekdayTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Days;
+
+use Butschster\CronExpression\Parts\Days\LastWeekday;
+use Butschster\CronExpression\Tests\TestCase;
+
+class LastWeekdayTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * LW * *', new LastWeekday());
+    }
+}
diff --git a/tests/Parts/Days/SpecificDaysTest.php b/tests/Parts/Days/SpecificDaysTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Days;
+
+use Butschster\CronExpression\Parts\Days\SpecificDays;
+use Butschster\CronExpression\Tests\TestCase;
+
+class SpecificDaysTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * 2,4,6,8,10,12 * *', new SpecificDays(2, 4, 6, 8, 10, 12));
+    }
+}
diff --git a/tests/Parts/DaysOfWeek/BetweenDayOfWeekTest.php b/tests/Parts/DaysOfWeek/BetweenDayOfWeekTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\DaysOfWeek;
+
+use Butschster\CronExpression\Generator;
+use Butschster\CronExpression\Parts\DaysOfWeek\BetweenDayOfWeek;
+use Butschster\CronExpression\Tests\TestCase;
+
+class BetweenDayOfWeekTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * * * 1-6', new BetweenDayOfWeek(Generator::MONDAY, Generator::SATURDAY));
+    }
+}
diff --git a/tests/Parts/DaysOfWeek/EveryDayOfWeekTest.php b/tests/Parts/DaysOfWeek/EveryDayOfWeekTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\DaysOfWeek;
+
+use Butschster\CronExpression\Parts\DaysOfWeek\EveryDayOfWeek;
+use Butschster\CronExpression\Tests\TestCase;
+
+class EveryDayOfWeekTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * * * */3', new EveryDayOfWeek(3));
+    }
+
+    public function testUpdatesExpressionWithoutArgs()
+    {
+        $this->assertExpressionPart('* * * * *', new EveryDayOfWeek());
+    }
+}
diff --git a/tests/Parts/DaysOfWeek/LastDayOfWeekTest.php b/tests/Parts/DaysOfWeek/LastDayOfWeekTest.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\DaysOfWeek;
+
+use Butschster\CronExpression\Generator;
+use Butschster\CronExpression\Parts\DaysOfWeek\LastDayOfWeek;
+use Butschster\CronExpression\Tests\TestCase;
+
+class LastDayOfWeekTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * * * 1L', new LastDayOfWeek());
+
+        $this->assertExpressionPart('* * * * 5L', new LastDayOfWeek(Generator::FRIDAY));
+    }
+}
diff --git a/tests/Parts/DaysOfWeek/NthDayOfWeekTest.php b/tests/Parts/DaysOfWeek/NthDayOfWeekTest.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\DaysOfWeek;
+
+use Butschster\CronExpression\Generator;
+use Butschster\CronExpression\Parts\DaysOfWeek\NthDayOfWeek;
+use Butschster\CronExpression\Tests\TestCase;
+
+class NthDayOfWeekTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * * * 1#1', new NthDayOfWeek());
+
+        $this->assertExpressionPart('* * * * 5#3', new NthDayOfWeek(Generator::FRIDAY, 3));
+    }
+}
diff --git a/tests/Parts/DaysOfWeek/SpecificDaysOfWeekTest.php b/tests/Parts/DaysOfWeek/SpecificDaysOfWeekTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\DaysOfWeek;
+
+use Butschster\CronExpression\Parts\DaysOfWeek\SpecificDaysOfWeek;
+use Butschster\CronExpression\Tests\TestCase;
+
+class SpecificDaysOfWeekTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* * * * 2,4,6', new SpecificDaysOfWeek(2, 4, 6));
+    }
+}
diff --git a/tests/Parts/Hours/BetweenHoursTest.php b/tests/Parts/Hours/BetweenHoursTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Hours;
+
+use Butschster\CronExpression\Parts\Hours\BetweenHours;
+use Butschster\CronExpression\Tests\TestCase;
+
+class BetweenHoursTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* 6-12 * * *', new BetweenHours(6, 12));
+    }
+}
diff --git a/tests/Parts/Hours/EveryHourTest.php b/tests/Parts/Hours/EveryHourTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Hours;
+
+use Butschster\CronExpression\Parts\Hours\EveryHour;
+use Butschster\CronExpression\Tests\TestCase;
+
+class EveryHourTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* */3 * * *', new EveryHour(3));
+    }
+
+    public function testUpdatesExpressionWithoutArgs()
+    {
+        $this->assertExpressionPart('* * * * *', new EveryHour());
+    }
+}
diff --git a/tests/Parts/Hours/SpecificHoursTest.php b/tests/Parts/Hours/SpecificHoursTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Hours;
+
+use Butschster\CronExpression\Parts\Hours\SpecificHours;
+use Butschster\CronExpression\Tests\TestCase;
+
+class SpecificHoursTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('* 2,4,6,8,10,12 * * *', new SpecificHours(2, 4, 6, 8, 10, 12));
+    }
+}
diff --git a/tests/Parts/Minutes/BetweenMinutesTest.php b/tests/Parts/Minutes/BetweenMinutesTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Minutes;
+
+use Butschster\CronExpression\Parts\Minutes\BetweenMinutes;
+use Butschster\CronExpression\Tests\TestCase;
+
+class BetweenMinutesTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('6-12 * * * *', new BetweenMinutes(6, 12));
+    }
+}
diff --git a/tests/Parts/Minutes/EveryMinuteTest.php b/tests/Parts/Minutes/EveryMinuteTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Butschster\CronExpression\Tests\Parts\Minutes;
+
+use Butschster\CronExpression\Parts\Minutes\EveryMinute;
+use Butschster\CronExpression\Tests\TestCase;
+
+class EveryMinuteTest extends TestCase
+{
+    public function testUpdatesExpression()
+    {
+        $this->assertExpressionPart('*/3 * * * *', new EveryMinute(3));
+    }
+
+    public function testUpdatesExpressionWithoutArgs()
+    {
+        $this->assertExpressionPart('* * * * *', new EveryMinute());
+    }
+}
diff --git a/tests/Parts/Minutes/SpecificMinutesTest.php b/tests/Parts/Minutes/SpecificMinutesTest.php
diff --git a/tests/Parts/Months/BetweenMonthsTest.php b/tests/Parts/Months/BetweenMonthsTest.php
diff --git a/tests/Parts/Months/EveryMonthTest.php b/tests/Parts/Months/EveryMonthTest.php
diff --git a/tests/Parts/Months/QuarterlyTest.php b/tests/Parts/Months/QuarterlyTest.php
diff --git a/tests/Parts/Months/SpecificMonthsTest.php b/tests/Parts/Months/SpecificMonthsTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,10 @@ public function __toString(): string`
`86`	`86`
`87`	`87`	`public function toExpression(): string`
`88`	`88`	`{`
`89`		`- return $this->getExpression()->getExpression();`
	`89`	`+ return (string) $this->getExpression()->getExpression();`
`90`	`90`	`}`
`91`	`91`
`92`		`- public function setExpresion(CronExpression $expression): self`
	`92`	`+ public function setExpression(CronExpression $expression): self`
`93`	`93`	`{`
`94`	`94`	`$this->expression = $expression;`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use Butschster\CronExpression\Parts\Every;`
`8`	`8`
`9`		`-class EveryDaysOfWeek extends Every`
	`9`	`+class EveryDayOfWeek extends Every`
`10`	`10`	`{`
`11`	`11`	`use DaysOfWeekIndex;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Butschster\CronExpression\PartValueInterface;`
`9`	`9`	`use Cron\CronExpression;`
`10`	`10`
`11`		`-class LastDayOwWeek implements PartValueInterface`
	`11`	`+class LastDayOfWeek implements PartValueInterface`
`12`	`12`	`{`
`13`	`13`	`public function __construct(private int $dayOfWeek = Generator::MONDAY)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ public function dailyAt(int $hour, int $minute = 0): self`
`26`	`26`	`);`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function twiceDaily($first = 1, $second = 13): self`
	`29`	`+ public function twiceDaily(int $first = 1, int $second = 13): self`
`30`	`30`	`{`
`31`	`31`	`return $this->daily($first, $second);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function twiceDailyAt($first = 1, $second = 13, $minute = 0): self`
	`34`	`+ public function twiceDailyAt(int $first = 1, int $second = 13, int $minute = 0): self`
`35`	`35`	`{`
`36`	`36`	`return $this->daily($first, $second)->set(new SpecificMinutes($minute));`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Butschster\CronExpression\Traits;`
`6`	`6`
`7`	`7`	`use Butschster\CronExpression\Parts\Days\SpecificDays;`
`8`		`-use Butschster\CronExpression\Parts\DaysOfWeek\LastDayOwWeek;`
	`8`	`+use Butschster\CronExpression\Parts\DaysOfWeek\LastDayOfWeek;`
`9`	`9`	`use Butschster\CronExpression\Parts\DaysOfWeek\NthDayOfWeek;`
`10`	`10`
`11`	`11`	`trait Months`
`@@ -36,7 +36,7 @@ public function twiceMonthly(int $first = 1, int $second = 16, int $hour = 0, in`
`36`	`36`
`37`	`37`	`public function lastDayOfWeekEveryMonth(int $dayOfWeek = self::MONDAY, int $hour = 0, int $minute = 0): self`
`38`	`38`	`{`
`39`		`- return $this->dailyAt($hour, $minute)->set(new LastDayOwWeek($dayOfWeek));`
	`39`	`+ return $this->dailyAt($hour, $minute)->set(new LastDayOfWeek($dayOfWeek));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function nthDayOfWeekEveryMonth(int $dayOfWeek = self::MONDAY, int $nth = 1, int $hour = 0, int $minute = 0): self`