SS4 Upgrade **** WORK IN PROGRESS ****

.circleci/config.yml

@@ -0,0 +1,58 @@
+# PHP CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-php/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      - image: brettt89/silverstripe-web:7.1-platform
+        environment:
+          - SS_DATABASE_CLASS=MySQLPDODatabase
+          - SS_DATABASE_SERVER=127.0.0.1
+          - SS_DATABASE_USERNAME=root
+          - SS_DATABASE_PASSWORD=ubuntu
+          - SS_DATABASE_NAME=circle_test
+          - SS_ENVIRONMENT_TYPE=dev
+      - image: circleci/mysql:5.7
+        environment:
+          - MYSQL_USER=root
+          - MYSQL_ROOT_PASSWORD=ubuntu
+          - MYSQL_DATABASE=circle_test
+          - MYSQL_HOST=127.0.0.1
+
+    working_directory: ~/var/www
+
+    branches:
+      only:
+        - master
+        - develop
+        - upgradess4
+        - unittests
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "composer.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      - run: composer validate
+      - run: composer require --prefer-source --no-update silverstripe/recipe-cms:1.1.x-dev
+      - run: composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+
+
+
+      - save_cache:
+          paths:
+            - ./vendor
+          key: v1-dependencies-{{ checksum "composer.json" }}
+
+      # run test,upload coverage
+      #- run: vendor/bin/phpstan analyze code
+      - run: phpdbg -qrr vendor/bin/phpunit -d memory_limit=512M --coverage-clover=coverage.xml tests/
+      - run: bash <(curl -s https://codecov.io/bash) -f coverage.xml
+

.travis.yml

@@ -1,36 +1,44 @@
-# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
-
-sudo: false
-
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
+dist: trusty
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.2
+  global:
+    - COMPOSER_ROOT_VERSION=4.0.x-dev
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.1
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.2
-  allow_failures:
+      env: DB=MYSQL INSTALLER_VERSION=4.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
+      env: DB=PGSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
+    - php: 7.2
+      env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1
 
 before_script:
-  - composer self-update || true
-  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
-  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
-  - cd ~/builds/ss
-  - composer install
+  # Init PHP
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+
+  # Install composer dependencies
+  - composer validate
+  - echo $INSTALLER_VERSION
+  - composer require --prefer-source --no-update silverstripe/recipe-cms:1.1.x-dev
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
+  - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+  - vendor/bin/sake flush=all
+
+  - php vendor/silverstripe/framework/tests/dump_constants.php
 
 script:
-  - vendor/bin/phpunit silverstripe-calendar/tests
+  - if [[ $PHPUNIT_TEST ]]; then find . | grep Sapphire && vendor/bin/phpunit tests/; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml tests/; fi
+
+after_success:
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

README.md

@@ -1,4 +1,21 @@
 # SilverStripe Calendar
+[![Build Status](https://travis-ci.org/gordonbanderson/silverstripe-calendar.svg?branch=upgradess4)](https://travis-ci.org/gordonbanderson/silverstripe-calendar)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/gordonbanderson/silverstripe-calendar/badges/quality-score.png?b=upgradess4)](https://scrutinizer-ci.com/g/gordonbanderson/silverstripe-calendar/?branch=upgradess4)
+[![Code Coverage](https://scrutinizer-ci.com/g/gordonbanderson/silverstripe-calendar/badges/coverage.png?b=upgradess4)](https://scrutinizer-ci.com/g/gordonbanderson/silverstripe-calendar/?branch=upgradess4)
+[![Build Status](https://scrutinizer-ci.com/g/gordonbanderson/silverstripe-calendar/badges/build.png?b=upgradess4)](https://scrutinizer-ci.com/g/gordonbanderson/silverstripe-calendar/build-status/upgradess4)
+[![codecov.io](https://codecov.io/github/gordonbanderson/silverstripe-calendar/coverage.svg?branch=upgradess4)](https://codecov.io/github/gordonbanderson/silverstripe-calendar?branch=upgradess4)
+
+[![Latest Stable Version](https://poser.pugx.org/titledk/silverstripe-calendar/version)](https://packagist.org/packages/titledk/silverstripe-calendar)
+[![Latest Unstable Version](https://poser.pugx.org/titledk/silverstripe-calendar/v/unstable)](//packagist.org/packages/titledk/silverstripe-calendar)
+[![Total Downloads](https://poser.pugx.org/titledk/silverstripe-calendar/downloads)](https://packagist.org/packages/titledk/silverstripe-calendar)
+[![License](https://poser.pugx.org/titledk/silverstripe-calendar/license)](https://packagist.org/packages/titledk/silverstripe-calendar)
+[![Monthly Downloads](https://poser.pugx.org/titledk/silverstripe-calendar/d/monthly)](https://packagist.org/packages/titledk/silverstripe-calendar)
+[![Daily Downloads](https://poser.pugx.org/titledk/silverstripe-calendar/d/daily)](https://packagist.org/packages/titledk/silverstripe-calendar)
+
+[![Dependency Status](https://www.versioneye.com/php/titledk:silverstripe-calendar/badge.svg)](https://www.versioneye.com/php/titledk:silverstripe-calendar)
+[![Reference Status](https://www.versioneye.com/php/titledk:silverstripe-calendar/reference_badge.svg?style=flat)](https://www.versioneye.com/php/titledk:silverstripe-calendar/references)
+
+![codecov.io](https://codecov.io/github/gordonbanderson/silverstripe-calendar/branch.svg?branch=upgradess4)
 
 _by Title Web Solutions_
 
@@ -93,6 +110,7 @@ time picker and dropdown, and duration dropdown, still allowing manual inputs
 
 * [Anselm Christophersen](https://github.com/anselmdk)
 * [Colin Burns](https://github.com/colinburns)
+* [Gordon Anderson](https://github.com/gordonbanderson)  (SS4 upgrade)
 
 
 ## License

_config/pickers.yml

@@ -0,0 +1,2 @@
+SilverStripe\Forms\FormField:
+  calendar_datepicker_class: 'hasDatepicker'

_config/registration.yml

@@ -0,0 +1,7 @@
+---
+Name: silverstripe-calendar-registration
+---
+TitleDK\Calendar\Events\Event:
+  # Embargo registration relative to end date or calculated end date.  Negative values are before the end datetime, so
+  # a value of -1440 is a day ago.  Use a positive value to allow for registration during a multiday event
+  embargo_registration_relative_to_end_datetime_mins: 0

_config/relationships.yml

@@ -0,0 +1,3 @@
+SilverStripe\Security\Group:
+  many_many:
+    Calendars: TitleDK\Calendar\Calendars\Calendar

_config/routes.yml

@@ -1,9 +1,9 @@
 ---
 Name: calendaroutes
 ---
-Director:
+SilverStripe\Control\Director:
   rules:
-    'fullcalendar//$Action/$ID/$OtherID': 'FullcalendarController'
-    'calregistrations//$Action/$ID/$OtherID': 'EventRegistrationController'
-    'ics//$Action/$ID/$OtherID': 'ICSExport_Controller'
-    'EventRegistrationController//$Action/$ID/$OtherID': 'EventRegistrationController'
+    fullcalendar//$Action/$ID/$OtherID: TitleDK\Calendar\FullCalendar\FullcalendarController
+    calregistrations//$Action/$ID/$OtherID: TitleDK\Calendar\Registrations\EventRegistrationController
+    ics//$Action/$ID/$OtherID: TitleDK\Calendar\Libs\ColorPool\ICSExport_Controller
+    EventRegistrationController//$Action/$ID/$OtherID: TitleDK\Calendar\Registrations\EventRegistrationController

code/Admin/CalendarAdmin.php

@@ -0,0 +1,199 @@
+<?php
+namespace TitleDK\Calendar\Admin;
+
+use SilverShop\Admin\ProductBulkLoader;
+use SilverShop\Model\Variation\AttributeType;
+use SilverShop\Page\Product;
+use SilverShop\Page\ProductCategory;
+use SilverStripe\Dev\CsvBulkLoader;
+use SilverStripe\Forms\GridField\GridFieldImportButton;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\GridField\GridFieldExportButton;
+use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor;
+use SilverStripe\Forms\GridField\GridFieldFilterHeader;
+use SilverStripe\Forms\GridField\GridFieldPrintButton;
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Control\Controller;
+use SilverStripe\Admin\LeftAndMain;
+use SilverStripe\Admin\ModelAdmin;
+use SilverStripe\Security\PermissionProvider;
+use TitleDK\Calendar\Core\CalendarConfig;
+use TitleDK\Calendar\Events\Event;
+use TitleDK\Calendar\Events\EventCsvBulkLoader;
+
+/**
+ * Calendar Admin
+ *
+ * @package calendar
+ * @subpackage admin
+ */
+class CalendarAdmin extends ModelAdmin implements PermissionProvider
+{
+
+    private static $menu_title = "Calendar";
+    private static $url_segment = "calendar";
+
+    private static $allowed_actions = array(
+        'CalendarsForm',
+        'CategoriesForm',
+        'EventsForm'
+    );
+
+
+
+
+     private static $managed_models = array(
+        'TitleDK\Calendar\Events\Event',
+        'TitleDK\Calendar\Categories\PublicEventCategory',
+        'TitleDK\Calendar\Calendars\Calendar'
+    );
+
+    private static $model_importers = array(
+        'TitleDK\Calendar\Events\Event' => 'TitleDK\Calendar\Events\EventCsvBulkLoader',
+        'TitleDK\Calendar\Categories\PublicEventCategory' => 'SilverStripe\Dev\CsvBulkLoader',
+        'TitleDK\Calendar\Calendars\Calendar' => 'SilverStripe\Dev\CsvBulkLoader'
+    );
+
+
+    private static $menu_icon = "titledk/silverstripe-calendar:images/icons/calendar.png";
+
+    public function init()
+    {
+        parent::init();
+
+
+        //CSS/JS Dependencies - currently not much there
+        Requirements::css("titledk/silverstripe-calendar:css/admin/CalendarAdmin.css");
+        Requirements::javascript("titledk/silverstripe-calendar:javascript/admin/CalendarAdmin.js");
+    }
+
+    public function getModelClass()
+    {
+        return $this->sanitiseClassName($this->modelClass);
+    }
+
+    public function getManagedModels()
+    {
+        // Unset managed models according to config
+        /** @todo change to use config API */
+        $models = parent::getManagedModels();
+        if (!$this->calendarsEnabled()
+            && isset($models['Calendar'])) {
+            unset($models['Calendar']);
+        }
+        if (!$this->categoriesEnabled()
+            && isset($models['Calendar'])) {
+            unset($models['PublicEventCategory']);
+        }
+        return $models;
+    }
+
+    protected function determineFormClass()
+    {
+        switch ($this->modelClass) {
+            case 'Calendar':
+                $class = 'TitleDK\Calendar\Admin\Forms\CalendarsForm';
+                break;
+            case 'EventCategory':
+                $class = 'TitleDK\Calendar\Admin\Forms\CategoriesForm';
+                break;
+            case 'Event':
+                $class = 'TitleDK\Calendar\Admin\Forms\EventsForm';
+                break;
+            default:
+                $class = 'SilverStripe\Forms\Form'; // @todo was CMSForm
+                break;
+        }
+
+        return $class;
+    }
+
+    public function getEditForm($id = null, $fields = null)
+    {
+        $list = $this->getList();
+        $exportButton = new GridFieldExportButton('buttons-before-left');
+        $exportButton->setExportColumns($this->getExportFields());
+        $listField = GridField::create(
+            $this->sanitiseClassName($this->modelClass),
+            false,
+            $list,
+            $fieldConfig = GridFieldConfig_RecordEditor::create($this->stat('page_length'))
+                ->addComponent($exportButton)
+                ->removeComponentsByType(GridFieldFilterHeader::class)
+                ->addComponents(new GridFieldPrintButton('buttons-before-left'))
+        );
+
+        // Validation
+        if (singleton($this->modelClass)->hasMethod('getCMSValidator')) {
+            $detailValidator = singleton($this->modelClass)->getCMSValidator();
+            $listField->getConfig()->getComponentByType(GridFieldDetailForm::class)->setValidator($detailValidator);
+        }
+
+        if ($this->showImportForm) {
+            $fieldConfig->addComponent(
+                GridFieldImportButton::create('buttons-before-left')
+                    ->setImportForm($this->ImportForm())
+                    ->setModalTitle(_t('SilverStripe\\Admin\\ModelAdmin.IMPORT', 'Import from CSV'))
+            );
+        }
+
+        $formClass = $this->determineFormClass();
+
+        $form = $formClass::create(
+            $this,
+            'EditForm',
+            new FieldList($listField),
+            new FieldList()
+        )->setHTMLID('Form_EditForm');
+
+        // @todo This method does not exist $form->setResponseNegotiator($this->getResponseNegotiator());
+        $form->addExtraClass('cms-edit-form cms-panel-padded center');
+        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+        $editFormAction = Controller::join_links($this->Link($this->sanitiseClassName($this->modelClass)), 'EditForm');
+        $form->setFormAction($editFormAction);
+        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
+
+        $this->extend('updateEditForm', $form);
+
+        return $form;
+    }
+
+    protected function calendarsEnabled()
+    {
+        return CalendarConfig::subpackage_enabled('calendars');
+    }
+
+    protected function categoriesEnabled()
+    {
+        return CalendarConfig::subpackage_enabled('categories');
+    }
+
+    public function providePermissions()
+    {
+        $title = LeftAndMain::menu_title_for_class($this->class);
+        return array(
+            "CMS_ACCESS_CalendarAdmin" => array(
+                'name' => _t('CMSMain.ACCESS', "Access to '{title}' section", array('title' => $title)),
+                'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
+                'help' => 'Allow access to calendar management module.'
+            ),
+            "CALENDAR_MANAGE" => array(
+                'name' => _t('CalendarAdmin.CALENDAR_MANAGE', 'Manage calendars'),
+                'category' => _t('CalendarAdmin.CALENDAR_PERMISSION_CATEGORY', 'Calender'),
+                'help' => 'Allow creating, editing, and deleting calendars.'
+            ),
+            "EVENTCATEGORY_MANAGE" => array(
+                'name' => _t('CalendarAdmin.EVENTCATEGORY_MANAGE', 'Manage event categories'),
+                'category' => _t('CalendarAdmin.CALENDAR_PERMISSION_CATEGORY', 'Calender'),
+                'help' => 'Allow creating, editing, and deleting event categories.'
+            ),
+            "EVENT_MANAGE" => array(
+                'name' => _t('CalendarAdmin.EVENT_MANAGE', 'Manage events'),
+                'category' => _t('CalendarAdmin.CALENDAR_PERMISSION_CATEGORY', 'Calender'),
+                'help' => 'Allow creating, editing, and deleting events.'
+            )
+        );
+    }
+}