v2.0.21

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Solspace Calendar Changelog
 
+## 2.0.21 - 2019-07-26
+### Changed
+- Updated `carbon` dependency to `^1.22.1|^2.19` for better compatibility with other plugins, and to reduce the chances of seeing deprecation notice.
+- Updated event fetching to prevent from crashing when events have invalid dates.
+
+### Fixed
+- Fixed a bug in the database relation for the Calendar record.
+- Fixed a bug where the developer event names were wrong for the Calendars and Events service files.
+
 ## 2.0.20 - 2019-05-14
 ### Changed
 - Updated plugin icon.

README.md

@@ -9,4 +9,4 @@ The most reliable and powerful event management plugin for Craft. Set up beautif
 Calendar is the most reliable and powerful event management and calendaring plugin on the market for Craft CMS. The intuitive interface allows you to create events with complex recurring event rules and exclusions, while the flexible templating offers a variety of options to satisfy your calendaring needs. Stop wasting valuable development hours wrestling with and tuning Craft Entries or other alternatives. You can trust Calendar (and the team behind it) to deliver the quality and support you expect and deserve.
 
 ## Documentation
-Full documentation for Calendar can be found on the [Solspace documentation website](http://docs.solspace.com/craft/calendar/v2/).
+Full documentation for Calendar can be found on the [Solspace documentation website](https://docs.solspace.com/craft/calendar/v2/).

composer.json

@@ -1,12 +1,12 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "type": "craft-plugin",
   "authors": [
     {
       "name": "Solspace",
-      "homepage": "https://solspace.com/"
+      "homepage": "https://docs.solspace.com"
     }
   ],
   "require": {
@@ -17,7 +17,7 @@
     "symfony/finder": "^2.8|^3.0|^4.0",
     "symfony/filesystem": "^2.8|^3.0|^4.0",
     "solspace/craft3-commons": "^1.0.17",
-    "nesbot/carbon": "^1.22.1"
+    "nesbot/carbon": "^1.22.1|^2.19"
   },
   "autoload": {
     "psr-4": {
@@ -30,8 +30,8 @@
     "class": "Solspace\\Calendar\\Calendar",
     "name": "Calendar",
     "developer": "Solspace",
-    "developerUrl": "http://docs.solspace.com/craft/calendar/v2/",
-    "documentationUrl": "http://docs.solspace.com/craft/calendar/v2/",
+    "developerUrl": "https://docs.solspace.com/craft/calendar/v2/",
+    "documentationUrl": "https://docs.solspace.com/craft/calendar/v2/",
     "changelogUrl": "https://raw.githubusercontent.com/solspace/craft3-calendar/master/CHANGELOG.md",
     "hasSettings": true,
     "hasCpSection": true

src/Calendar.php

@@ -69,7 +69,7 @@ class Calendar extends Plugin
     const PERMISSION_EVENTS_FOR_ALL   = 'calendar-manageEventsFor:all';
     const PERMISSION_SETTINGS         = 'calendar-settings';
 
-    const PERMISSIONS_HELP_LINK = 'https://solspace.com/craft/calendar/docs/demo-templates';
+    const PERMISSIONS_HELP_LINK = 'https://docs.solspace.com/craft/calendar/v2/setup/demo-templates.html';
 
     /** @var array */
     private static $javascriptTranslationKeys = [

src/Elements/Db/EventQuery.php

@@ -9,6 +9,7 @@
 use Solspace\Calendar\Calendar;
 use Solspace\Calendar\Elements\Event;
 use Solspace\Calendar\Library\DateHelper;
+use Solspace\Calendar\Library\Exceptions\CalendarException;
 use Solspace\Calendar\Library\RecurrenceHelper;
 use Solspace\Calendar\Records\CalendarRecord;
 use Solspace\Calendar\Services\EventsService;
@@ -1174,7 +1175,10 @@ function ($data) {
      */
     private function storeEventOnDate(Event $event, Carbon $date)
     {
-        $this->events[] = $event->cloneForDate($date);
+        try {
+            $this->events[] = $event->cloneForDate($date);
+        } catch (CalendarException $e) {
+        }
     }
 
     /**

src/Elements/Event.php

@@ -1188,7 +1188,10 @@ public function getOccurrences(array $config = null): array
                     break;
                 }
 
-                $occurrences[] = $this->cloneForDate($date);
+                try {
+                    $occurrences[] = $this->cloneForDate($date);
+                } catch (CalendarException $e) {
+                }
             }
 
             $this->occurrenceCache[$configHash] = $occurrences;

src/Records/CalendarRecord.php

@@ -39,6 +39,6 @@ public static function tableName(): string
      */
     public function getFieldLayout()
     {
-        return $this->hasOne(FieldLayout::class, ['fieldLayoutId' => 'id']);
+        return $this->hasOne(FieldLayout::class, ['id' => 'fieldLayoutId']);
     }
 }

src/Services/CalendarsService.php

@@ -21,9 +21,9 @@
 class CalendarsService extends Component
 {
     const EVENT_BEFORE_SAVE   = 'beforeSave';
-    const EVENT_AFTER_SAVE    = 'beforeSave';
+    const EVENT_AFTER_SAVE    = 'afterSave';
     const EVENT_BEFORE_DELETE = 'beforeDelete';
-    const EVENT_AFTER_DELETE  = 'beforeDelete';
+    const EVENT_AFTER_DELETE  = 'afterDelete';
 
     /** @var CalendarModel[] */
     private $calendarCache;

src/Services/EventsService.php

@@ -21,9 +21,9 @@
 class EventsService extends Component
 {
     const EVENT_BEFORE_SAVE   = 'beforeSave';
-    const EVENT_AFTER_SAVE    = 'beforeSave';
+    const EVENT_AFTER_SAVE    = 'afterSave';
     const EVENT_BEFORE_DELETE = 'beforeDelete';
-    const EVENT_AFTER_DELETE  = 'beforeDelete';
+    const EVENT_AFTER_DELETE  = 'afterDelete';
 
     /**
      * Returns an event by its ID.

src/codepack/manifest.json

@@ -3,6 +3,6 @@
   "package_desc": "This package includes a set of sample templates that help demonstrate Calendar's abilities and get you better acquainted with it.",
   "package_version": "1.0.0",
   "vendor": "Solspace, Inc.",
-  "vendor_url": "https://solspace.com/craft",
-  "docs_url": "https://solspace.com/craft/calendar/docs"
+  "vendor_url": "https://docs.solspace.com",
+  "docs_url": "https://docs.solspace.com/craft/calendar/v2/"
 }

src/codepack/templates/layouts/_header.html

@@ -54,9 +54,9 @@
                     Resources
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                    <a class="dropdown-item" href="https://solspace.com/craft/calendar/">Calendar</a>
-                    <a class="dropdown-item" href="https://solspace.com/craft/calendar/docs">Documentation</a>
-                    <a class="dropdown-item" href="https://solspace.com/craft/calendar/support">Support</a>
+                    <a class="dropdown-item" href="https://docs.solspace.com/craft/calendar/v2/">Calendar</a>
+                    <a class="dropdown-item" href="https://docs.solspace.com/craft/calendar/v2/">Documentation</a>
+                    <a class="dropdown-item" href="https://docs.solspace.com/craft/calendar/v2/support.html">Support</a>
                 </div>
             </div>
         </div>