iCalcreator-2.27.20

Recras · May 25, 2019 · 2936c63 · 2936c63
1 parent 586a175
commit 2936c63
Show file tree

Hide file tree

Showing 27 changed files with 2,194 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ docs/summary and docs/using for details.
 
 Stable 2.26.8 *(master)*.
 
-Release 2.28 candidate (2.27.17)
+Release 2.28 candidate (2.27.20)
 
 Unsupported (tags): 
 - 2.26

diff --git a/autoload.php b/autoload.php
@@ -5,7 +5,7 @@
  * copyright (c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
  * Link      https://kigkonsult.se
  * Package   iCalcreator
- * Version   2.27.18
+ * Version   2.27.20
  * License   Subject matter of licence is the software iCalcreator.
  *           The above copyright, link, package and version notices,
  *           this licence notice and the invariant [rfc5545] PRODID result use
@@ -33,12 +33,12 @@
  * iCalcreator package autoloader
  *
  * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
- * @since 2.27.18 - 2019-04-09
+ * @since  2.27.20 - 2019-05-20
  */
 /**
  *         Do NOT alter or remove the constant!!
  */
-define( 'ICALCREATOR_VERSION', 'iCalcreator 2.27.18' );
+define( 'ICALCREATOR_VERSION', 'iCalcreator 2.27.20' );
 /**
  * load iCalcreator src and support classes and Traits
  */

diff --git a/composer.json b/composer.json
@@ -2,23 +2,24 @@
     "name": "kigkonsult/icalcreator",
     "type": "library",
     "description": "iCalcreator is the PHP implementation of rfc2445/rfc5545, management of calendar information",
-    "keywords": [ "rfc2445",
-                  "rfc5545",
-                  "rfc6321",
-                  "management",
-                  "calendar",
-                  "vCalendar",
-                  "vevent",
-                  "vtodo",
-                  "vjournal",
-                  "vfreebusy",
-                  "valarm",
-                  "vtimezone",
-                  "standard",
-                  "daylight",
-                  "file" ],
-    "time" : "2019-04-04",
-    "license": ["LGPL-3.0-or-later"],
+    "keywords": [
+        "rfc2445",
+        "rfc5545",
+        "rfc6321",
+        "management",
+        "calendar",
+        "vCalendar",
+        "vevent",
+        "vtodo",
+        "vjournal",
+        "vfreebusy",
+        "valarm",
+        "vtimezone",
+        "standard",
+        "daylight"
+    ],
+    "time" : "2019-05-25",
+    "license": "LGPL-3.0-or-later",
     "homepage": "https://kigkonsult.se",
     "support": {
        "issues": "https://github.com/iCalcreator/iCalcreator/issues"

diff --git a/docs/summary.html b/docs/summary.html
@@ -5,7 +5,7 @@
  copyright (c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
  Link      https://kigkonsult.se
  Package   iCalcreator
- Version   2.27.17
+ Version   2.27.20
  License   Subject matter of licence is the software iCalcreator.
            The above copyright, link, package and version notices,
            this licence notice and the invariant [rfc5545] PRODID result use
@@ -29,12 +29,12 @@
 -->
 <html lang="en">
 <head>
-    <title>iCalcreator 2.27.17 manual</title>
+    <title>iCalcreator 2.27.20 manual</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <meta name="author"      content="Kjell-Inge Gustafsson, kigkonsult, All rights reserved">
     <meta name="copyright"   content="2007-2019 Kjell-Inge Gustafsson, kigkonsult">
     <meta name="keywords"    content="ical, calendar, calender, xcal, xml, icalender, rfc2445, rfc5545, vcalender, php, create">
-    <meta name="description" content="using iCalcreator v2.27.17">
+    <meta name="description" content="using iCalcreator v2.27.20">
     <style type="text/css">
         * {
             FONT-FAMILY     : "Bitstream Vera Sans", Helvetica, "Lucida Grande","Lucida Sans Unicode", Lucida, Arial, Geneva, sans-serif;
@@ -144,9 +144,9 @@
 </head>
 <body>
 <a name="top"></a>
-<p class="header">iCalcreator v2.27.17</p>
+<p class="header">iCalcreator v2.27.20</p>
 <p>
-    iCalcreator v2.27.17<br>
+    iCalcreator v2.27.20<br>
     Copyright &copy; 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved.<br>
     <a href="#Copyright_and_Licence">Copyright_and_Licence</a><br>
     <a href="https://kigkonsult.se" title="kigkonsult.se" target="_blank">kigkonsult.se</a><br>
@@ -192,7 +192,7 @@ <h4>The software</h4>
     events, agendas, tasks, reports, totos and journaling information.
 </p>
 <p>
-For iCalcreator 2.27.17 version (and later), <em>PHP</em> version 5.6+ is required.
+For iCalcreator 2.27.20 version (and later), <em>PHP</em> version 5.6+ is required.
 </p>
 
 <h4>iCal</h4>
@@ -280,13 +280,13 @@ <h4>Install</h4>
 <dt>Or
 <dd> include the (download) iCalcreator folder to your include-path
 <dd>Add
-<dd><span class="format">require_once &quot;[path/]iCalcreator-2.27.17/autoload.php&quot;;</span>
+<dd><span class="format">require_once &quot;[path/]iCalcreator-2.27.20/autoload.php&quot;;</span>
 <dd>to your <em>PHP</em>-script.
 <dd>The iCalcreator invoker has changed since previous version!
 </dl>
 
 <p>
-iCalcreator 2.27.17 is using namespace &quot;Kigkonsult\Icalcreator&quot;.
+iCalcreator 2.27.20 is using namespace &quot;Kigkonsult\Icalcreator&quot;.
 </p>
 
 
@@ -712,7 +712,7 @@ <h2>COPYRIGHT AND LICENSE</h2>
     <tr><td>Copyright<td>(c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
     <tr><td>Link     <td>https://kigkonsult.se
     <tr><td>Package  <td>iCalcreator
-    <tr><td>Version  <td>2.27.17
+    <tr><td>Version  <td>2.27.20
     <tr><td class="top">License  <td>
         Subject matter of licence is the software iCalcreator.<br>
         The above copyright, link, package and version notices,<br>

diff --git a/docs/using.html b/docs/using.html
@@ -4,7 +4,7 @@
  copyright (c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
  Link      https://kigkonsult.se
  Package   iCalcreator
- Version   2.27.17
+ Version   2.27.20
  License   Subject matter of licence is the software iCalcreator.
            The above copyright, link, package and version notices,
            this licence notice and the invariant [rfc5545] PRODID result use
@@ -28,12 +28,12 @@
 -->
 <html lang="en">
 <head>
-<title>iCalcreator 2.27.17 manual</title>
+<title>iCalcreator 2.27.20 manual</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 <meta name="author"      content="Kjell-Inge Gustafsson, kigkonsult, All rights reserved">
 <meta name="copyright"   content="2007-2019 Kjell-Inge Gustafsson, kigkonsult">
 <meta name="keywords"    content="ical, calendar, calender, xcal, xml, icalender, rfc2445, rfc5545, vcalender, php, create">
-<meta name="description" content="using iCalcreator v2.27.17">
+<meta name="description" content="using iCalcreator v2.27.20">
 <style type="text/css">
 * {
   FONT-FAMILY     : "Bitstream Vera Sans", Helvetica, "Lucida Grande","Lucida Sans Unicode", Lucida, Arial, Geneva, sans-serif;
@@ -158,9 +158,9 @@
 </head>
 <body>
 <a name="top"></a>
-<p class="header">iCalcreator v2.27.17</p>
+<p class="header">iCalcreator v2.27.20</p>
 <p>
-iCalcreator v2.27.17<br>
+iCalcreator v2.27.20<br>
 Copyright &copy; 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved.<br>
 <a href="#Copyright_and_Licence">Copyright_and_Licence</a><br>
 <a href="https://kigkonsult.se" title="kigkonsult.se" target="_blank">kigkonsult.se</a><br>
@@ -212,7 +212,7 @@ <h2>Preface</h2>
 iCalcreator features create, parse, edit and select <strong>calendar</strong> and <strong>calendar</strong> components.
 </p>
 <p>
-For iCalcreator 2.27.17 version (and later), <em>PHP</em> version &gt;= 5.6 is required.
+For iCalcreator 2.27.20 version (and later), <em>PHP</em> version &gt;= 5.6 is required.
 </p>
 <br>
 <a href="#INDEX">[index]</a> <a href="#top">[top]</a>
@@ -333,11 +333,11 @@ <h4>xCal</h4>
 <dt>Or
 <dd> include the (download) iCalcreator folder to your include-path
 <dd>Add
-<dd><span class="format">require_once &quot;[path/]iCalcreator-2.27.17/autoload.php&quot;;</span>
+<dd><span class="format">require_once &quot;[path/]iCalcreator-2.27.20/autoload.php&quot;;</span>
 <dd>to your <em>PHP</em>-script.
 </dl>
 <p>
-iCalcreator 2.27.17 is using namespace &quot;Kigkonsult\Icalcreator&quot;.
+iCalcreator 2.27.20 is using namespace &quot;Kigkonsult\Icalcreator&quot;.
 </p>
 
 <br>
@@ -2990,7 +2990,7 @@ <h5>Set X-PROPERTY</h5>
 
 $str       = [
     &quot;BEGIN:VCALENDAR&quot;,
-    &quot;PRODID:-//kigkonsult.se//NONSGML kigkonsult.se iCalcreator 2.27.17//&quot;,
+    &quot;PRODID:-//kigkonsult.se//NONSGML kigkonsult.se iCalcreator 2.27.20//&quot;,
     &quot;VERSION:2.0&quot;,
     &quot;BEGIN:VEVENT&quot;,
     &quot;DTSTART:20101224T190000Z&quot;,
@@ -8736,7 +8736,7 @@ <h5>XML2iCal</h5>
 <tr><td>Copyright<td>(c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
 <tr><td>Link     <td>https://kigkonsult.se
 <tr><td>Package  <td>iCalcreator
-<tr><td>Version  <td>2.27.17
+<tr><td>Version  <td>2.27.20
 <tr><td class="top">License  <td>
     Subject matter of licence is the software iCalcreator.<br>
     The above copyright, link, package and version notices,<br>

diff --git a/phpunit.xml b/phpunit.xml
@@ -5,7 +5,7 @@
  copyright (c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
  Link      https://kigkonsult.se
  Package   iCalcreator
- Version   2.27.17
+ Version   2.27.20
  License   Subject matter of licence is the software iCalcreator.
            The above copyright, link, package and version notices,
            this licence notice and the invariant [rfc5545] PRODID result use
@@ -35,7 +35,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          syntaxCheck="false"
-         bootstrap="autoload.php"
+         bootstrap="test/autoload.php"
         >
     <testsuites>
         <testsuite name="Vcalendar Tests">
@@ -69,7 +69,10 @@
             <file>./test/VtimezoneTest.php</file>
         </testsuite>
         <testsuite name="Recur Tests">
-            <file>./test/RecurTest.php</file>
+            <file>./test/RecurYearTest.php</file>
+            <file>./test/RecurMonthTest.php</file>
+            <file>./test/RecurWeekTest.php</file>
+            <file>./test/RecurDayTest.php</file>
             <file>./test/SelectComponentsTest.php</file>
         </testsuite>
         <testsuite name="vCard Tests">

diff --git a/releaseNotes b/releaseNotes
@@ -45,3 +45,6 @@ iCalcreator 2.27.16 releaseNotes
  2.27.18 bugs - SelectFactory::selectComponents args calendar, cType reviewing
 
  2.27.19 bug - typo in DateTimeFactory::dateTimeHasOffset
+------------
+
+ 2.27.20 bug - Break/Continue mixup in RecurFactory::recurWeeklySimple2: split up tests, minor code clean up
diff --git a/src/IcalBase.php b/src/IcalBase.php
@@ -5,7 +5,7 @@
  * copyright (c) 2007-2019 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
  * Link      https://kigkonsult.se
  * Package   iCalcreator
- * Version   2.27.18
+ * Version   2.27.20
  * License   Subject matter of licence is the software iCalcreator.
  *           The above copyright, link, package and version notices,
  *           this licence notice and the invariant [rfc5545] PRODID result use
@@ -27,7 +27,6 @@
  *
  * This file is a part of iCalcreator.
  */
-
 namespace Kigkonsult\Icalcreator;
 
 use Kigkonsult\Icalcreator\Util\Util;
@@ -61,7 +60,7 @@
  *         Do NOT alter or remove the constant!!
  */
 if( ! defined( 'ICALCREATOR_VERSION' )) {
-    define( 'ICALCREATOR_VERSION', 'iCalcreator 2.27.18' );
+    define( 'ICALCREATOR_VERSION', 'iCalcreator 2.27.20' );
 }
 
 /**
@@ -70,7 +69,7 @@
  * Properties and methods shared by Vcalendar and CalendarComponents
  *
  * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
- * @since  2.27.9 - 2018-12-29
+ * @since  2.27.20 - 2019-05-20
  */
 abstract class IcalBase implements IcalInterface
 {

diff --git a/src/Util/RecurFactory.php b/src/Util/RecurFactory.php
@@ -906,7 +906,6 @@ public static function recurWeeklySimple2(
             switch( true ) {
                 case( $Ymd <= $fcnStartYmd ) :
                     $wDate = $wDate->modify( $modify1 );
-                    continue;
                     break;
                 case( $endYmd < $Ymd ) :
                     break 2;
@@ -917,7 +916,7 @@ public static function recurWeeklySimple2(
                         }
                     }
                     $wDate = $wDate->modify( $modify1 );
-                    continue;
+                    break;
                 default :
                     // now is the first day of next week
                     if( 1 < $recur[Vcalendar::INTERVAL] ) {
@@ -1317,7 +1316,7 @@ public static function fullRecur2date(
             }
         } // end if( isset( $recur[Vcalendar::UNTIL] ))
         if( $wDateYMD > $fcnEndYMD ) {
-            return []; // nothing to do.. .
+            return; // nothing to do.. .
         }
         $recurFreqIsYearly  = ( Vcalendar::YEARLY  == $recur[Vcalendar::FREQ] );
         $recurFreqIsMonthly = ( Vcalendar::MONTHLY == $recur[Vcalendar::FREQ] );

diff --git a/src/Util/RexdateFactory.php b/src/Util/RexdateFactory.php
@@ -110,7 +110,6 @@ public static function formatExdate( $exdateData, $allowEmpty ) {
             $content   = $attributes = null;
             foreach(( array_keys( $theExdate[Util::$LCvalue] )) as $eix ) {
                 $exdatePart = $theExdate[Util::$LCvalue][$eix];
-                $parNo      = count( $exdatePart );
                 $formatted  = DateTimeFactory::dateArrayToStr( $exdatePart, $isValueDate );
                 if( isset( $theExdate[Util::$LCparams][Vcalendar::TZID] )) {
                     $formatted = str_replace( Vcalendar::Z, null, $formatted );
@@ -534,8 +533,6 @@ public static function prepInputRdate( array $rDates, $params=null, $compType=nu
                 $output[Util::$LCparams][Vcalendar::TZID] = $paramTZid;
             }
         }
-        else
-            unset( $wDate[Util::$LCtz] );
         $output[Util::$LCparams] = array_filter( $output[Util::$LCparams] );
         return $output;
     }

diff --git a/src/Util/Util.php b/src/Util/Util.php
@@ -31,14 +31,10 @@
 namespace Kigkonsult\Icalcreator\Util;
 
 use Kigkonsult\Icalcreator\Vcalendar;
-use InvalidArgumentException;
 
 use function array_key_exists;
 use function in_array;
 use function is_array;
-use function method_exists;
-use function sort;
-use function strpos;
 use function strtolower;
 use function strtoupper;
 use function ucfirst;

diff --git a/test/DateIntervalTest.php b/test/DateIntervalTest.php
@@ -37,8 +37,6 @@
 use Kigkonsult\Icalcreator\Util\ParameterFactory;
 use Exception;
 
-include_once 'DtBase.php';
-
 /**
  * class DateTzTest, testing VALUE DATETIME for Standard/Daylight (allways local time), also empty value, DTSTART
  *

diff --git a/test/DateTest.php b/test/DateTest.php
@@ -34,8 +34,6 @@
 use Kigkonsult\Icalcreator\Util\DateTimeFactory;
 use Kigkonsult\Icalcreator\Util\Util;
 
-include_once 'DtBase.php';
-
 /**
  * class DateTest, testing VALUE DATE, also empty value, DTSTART, DTEND, DUE, RECURRENCE_ID, (single) EXDATE + RDATE
  *

diff --git a/test/DateTimeTest.php b/test/DateTimeTest.php
@@ -35,8 +35,6 @@
 use Kigkonsult\Icalcreator\Util\DateTimeFactory;
 use Kigkonsult\Icalcreator\Util\Util;
 
-include_once 'DtBase.php';
-
 /**
  * class DateTimeTest, testing DTSTART, DTEND, DUE, RECURRENCE_ID, (single) EXDATE + RDATE
  *

diff --git a/test/DateTimeUTCTest.php b/test/DateTimeUTCTest.php
@@ -34,8 +34,6 @@
 use Kigkonsult\Icalcreator\Util\StringFactory;
 use Kigkonsult\Icalcreator\Util\Util;
 
-include_once 'DtBase.php';
-
 /**
  * class DateTest, testing DTSTAMP, LAST_MODIFIED, CREATED, COMPLETED, DTSTART (VFREEBUSY)
  *

diff --git a/test/DateTzTest.php b/test/DateTzTest.php
@@ -36,8 +36,6 @@
 use Kigkonsult\Icalcreator\Util\Util;
 use Kigkonsult\Icalcreator\Util\ParameterFactory;
 
-include_once 'DtBase.php';
-
 /**
  * class DateTzTest, testing VALUE DATETIME for Standard/Daylight (allways local time), also empty value, DTSTART
  *