From 5e8d8db6e9e202b51e3ee70b86c98b40267362f2 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sun, 17 Oct 2021 17:19:53 +0200 Subject: [PATCH] Feature: Support php7.4 (#1354) * Run CI tests against php 7.4 * Sort composer dependencies * Remove unused Aws S3 php library * Pin simplepie dependency to ^1.5 * Pin getid3 dependency to ^1.9 * Pin composer semver to ^3.2 * Pin php-amqplib to ^2.12 * Drop sentry logging support * Update composer dependencies * Move propel regenerate to Makefile * Regenerate propel files with v1.7.0 * Pin propel orm to ^1.7 * Regenerate propel files with v1.7.2 * fix: generator_version in airtime-conf-production.php * Replace propel/propel1 with jooola/propel1 * Regenerate propel files with v1.7.3-dev * Fix php7.4 compatibility Using php-cs-fixer: '@PhpCsFixer' => true, 'concat_space' => ['spacing' => 'one'], 'ordered_class_elements' => false, 'yoda_style' => false, '@PHP74Migration' => true, 'assign_null_coalescing_to_coalesce_equal' => false, 'ternary_to_null_coalescing' => false, 'heredoc_indentation' => false, '@PHP74Migration:risky' => true, 'declare_strict_types' => false, 'void_return' => false, 'use_arrow_functions' => false, * Fix pre-commit --- .github/workflows/test.yml | 3 + dev_tools/propel_regenerate.sh | 14 - legacy/Makefile | 5 + legacy/application/common/DateHelper.php | 4 +- legacy/application/common/OsPath.php | 2 +- legacy/application/common/PodcastManager.php | 2 +- .../configs/airtime-conf-production.php | 2 +- legacy/application/configs/airtime-conf.php | 4 +- .../configs/classmap-airtime-conf.php | 16 +- .../application/controllers/ApiController.php | 10 +- .../controllers/LibraryController.php | 4 +- .../controllers/ListenerstatController.php | 12 +- .../controllers/PlayouthistoryController.php | 8 +- .../controllers/PluploadController.php | 2 +- .../controllers/ScheduleController.php | 10 +- .../controllers/ShowbuilderController.php | 4 +- .../controllers/WebstreamController.php | 2 +- .../plugins/PageLayoutInitPlugin.php | 2 +- .../controllers/plugins/RabbitMqPlugin.php | 2 +- legacy/application/forms/AddShowWhen.php | 2 +- legacy/application/forms/Player.php | 2 +- .../application/forms/SmartBlockCriteria.php | 2 +- legacy/application/logging/Logging.php | 1 - legacy/application/logging/SentryLogging.php | 135 --- legacy/application/models/Auth.php | 2 +- legacy/application/models/Block.php | 4 +- legacy/application/models/Datatables.php | 16 +- legacy/application/models/ListenerStat.php | 4 +- legacy/application/models/LiveLog.php | 8 +- legacy/application/models/Schedule.php | 6 +- legacy/application/models/Scheduler.php | 4 +- legacy/application/models/Show.php | 12 +- legacy/application/models/StoredFile.php | 8 +- legacy/application/models/Tracktype.php | 2 +- legacy/application/models/User.php | 2 +- legacy/application/models/Webstream.php | 8 +- legacy/application/models/airtime/CcFiles.php | 2 +- .../airtime/map/CcTracktypesTableMap.php | 9 +- .../models/airtime/om/BaseCcBlock.php | 14 +- .../models/airtime/om/BaseCcBlockcontents.php | 6 +- .../models/airtime/om/BaseCcBlockcriteria.php | 8 +- .../models/airtime/om/BaseCcCountry.php | 4 +- .../models/airtime/om/BaseCcFiles.php | 242 ++-- .../models/airtime/om/BaseCcFilesQuery.php | 116 +- .../models/airtime/om/BaseCcLiveLog.php | 2 +- .../models/airtime/om/BaseCcLoginAttempts.php | 2 +- .../models/airtime/om/BaseCcMountName.php | 2 +- .../models/airtime/om/BaseCcMusicDirs.php | 4 +- .../models/airtime/om/BaseCcPerms.php | 4 +- .../models/airtime/om/BaseCcPlaylist.php | 6 +- .../airtime/om/BaseCcPlaylistcontents.php | 6 +- .../om/BaseCcPlayoutHistoryMetaData.php | 4 +- .../om/BaseCcPlayoutHistoryTemplate.php | 4 +- .../om/BaseCcPlayoutHistoryTemplateField.php | 6 +- .../models/airtime/om/BaseCcPref.php | 4 +- .../models/airtime/om/BaseCcSchedule.php | 6 +- .../airtime/om/BaseCcServiceRegister.php | 4 +- .../models/airtime/om/BaseCcSess.php | 4 +- .../models/airtime/om/BaseCcShow.php | 18 +- .../models/airtime/om/BaseCcShowDays.php | 4 +- .../models/airtime/om/BaseCcShowInstances.php | 4 +- .../airtime/om/BaseCcShowRebroadcast.php | 2 +- .../models/airtime/om/BaseCcStreamSetting.php | 6 +- .../models/airtime/om/BaseCcSubjs.php | 18 +- .../models/airtime/om/BaseCcSubjsToken.php | 4 +- .../models/airtime/om/BaseCcTracktypes.php | 72 +- .../airtime/om/BaseCcTracktypesPeer.php | 12 +- .../airtime/om/BaseCcTracktypesQuery.php | 69 +- .../models/airtime/om/BaseCcWebstream.php | 10 +- .../airtime/om/BaseCcWebstreamMetadata.php | 2 +- .../models/airtime/om/BaseCeleryTasks.php | 6 +- .../models/airtime/om/BaseCloudFile.php | 4 +- .../models/airtime/om/BasePodcast.php | 26 +- .../models/airtime/om/BasePodcastEpisodes.php | 8 +- .../om/BaseThirdPartyTrackReferences.php | 6 +- .../models/formatters/LengthFormatter.php | 2 +- .../application/services/CalendarService.php | 2 +- .../application/services/HistoryService.php | 14 +- legacy/application/services/MediaService.php | 4 +- .../services/PodcastEpisodeService.php | 2 +- .../application/services/PodcastService.php | 2 +- .../application/services/SchedulerService.php | 2 +- legacy/application/services/ShowService.php | 12 +- legacy/composer.json | 54 +- legacy/composer.lock | 1001 ++++++----------- legacy/public/setup/database-setup.php | 2 +- legacy/public/setup/general-setup.php | 18 +- legacy/public/setup/media-setup.php | 18 +- legacy/public/setup/setup-functions.php | 4 +- legacy/tests/application/bootstrap.php | 4 +- 90 files changed, 887 insertions(+), 1310 deletions(-) delete mode 100755 dev_tools/propel_regenerate.sh delete mode 100644 legacy/application/logging/SentryLogging.php diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6470f48c..cc369dc29 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,10 +57,13 @@ jobs: test-legacy: strategy: + fail-fast: false matrix: include: - runs-on: ubuntu-18.04 php-version: "7.2" + - runs-on: ubuntu-latest + php-version: "7.4" runs-on: ${{ matrix.runs-on }} env: diff --git a/dev_tools/propel_regenerate.sh b/dev_tools/propel_regenerate.sh deleted file mode 100755 index c1686c302..000000000 --- a/dev_tools/propel_regenerate.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Absolute path to this script -SCRIPT=$(readlink -f "$0") -# Absolute directory this script is in -SCRIPTPATH=$(dirname "$SCRIPT") - -cd "$SCRIPTPATH/../legacy/" || (echo "could not cd in $SCRIPTPATH/../legacy/" && exit 1) -path=$(pwd) -cd build -sed -i "s|\"project\.home =.*$\"|\"project.home = $path\"|g" build.properties -../vendor/propel/propel1/generator/bin/propel-gen diff --git a/legacy/Makefile b/legacy/Makefile index 6e4fba474..95b003cc2 100644 --- a/legacy/Makefile +++ b/legacy/Makefile @@ -30,3 +30,8 @@ lint: $(PHP-CS-FIXER) .PHONY: build build: COMPOSER_ARGS="--no-dev --ignore-platform-reqs" $(MAKE) + +propel-gen: vendor + cd build && \ + ../vendor/bin/propel-gen \ + -Dproject.home="$(shell pwd)" diff --git a/legacy/application/common/DateHelper.php b/legacy/application/common/DateHelper.php index b258dd804..183aa7294 100644 --- a/legacy/application/common/DateHelper.php +++ b/legacy/application/common/DateHelper.php @@ -177,13 +177,13 @@ class Application_Common_DateHelper } if (1 === substr_count($p_time, '.')) { - list($hhmmss, $ms) = explode('.', $p_time); + [$hhmmss, $ms] = explode('.', $p_time); } else { $hhmmss = $p_time; $ms = 0; } - list($hours, $minutes, $seconds) = explode(':', $hhmmss); + [$hours, $minutes, $seconds] = explode(':', $hhmmss); $totalSeconds = ($hours * 3600 + $minutes * 60 + $seconds) . ".{$ms}"; diff --git a/legacy/application/common/OsPath.php b/legacy/application/common/OsPath.php index e0f91cf49..71b62d6bc 100644 --- a/legacy/application/common/OsPath.php +++ b/legacy/application/common/OsPath.php @@ -70,7 +70,7 @@ class Application_Common_OsPath $paths[0] = DIRECTORY_SEPARATOR . $paths[0]; } - return join(DIRECTORY_SEPARATOR, $paths); + return implode(DIRECTORY_SEPARATOR, $paths); } public static function getBaseDir() diff --git a/legacy/application/common/PodcastManager.php b/legacy/application/common/PodcastManager.php index 621b55a6d..bd2eee4c3 100644 --- a/legacy/application/common/PodcastManager.php +++ b/legacy/application/common/PodcastManager.php @@ -61,7 +61,7 @@ class PodcastManager $episodeList = $service->getPodcastEpisodes($podcast->getDbPodcastId()); $episodes = []; usort($episodeList, [__CLASS__, '_sortByEpisodePubDate']); - for ($i = 0; $i < sizeof($episodeList); ++$i) { + for ($i = 0; $i < count($episodeList); ++$i) { $episodeData = $episodeList[$i]; $ts = $podcast->getDbAutoIngestTimestamp(); // If the timestamp for this podcast is empty (no previous episodes have been ingested) and there are no diff --git a/legacy/application/configs/airtime-conf-production.php b/legacy/application/configs/airtime-conf-production.php index 75781e8e1..be89c9da5 100644 --- a/legacy/application/configs/airtime-conf-production.php +++ b/legacy/application/configs/airtime-conf-production.php @@ -26,7 +26,7 @@ $conf = [ ], 'default' => 'airtime', ], - 'generator_version' => '1.7.0', + 'generator_version' => '1.7.3-dev', ]; $conf['classmap'] = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php'; diff --git a/legacy/application/configs/airtime-conf.php b/legacy/application/configs/airtime-conf.php index 045c017c9..378ae414d 100644 --- a/legacy/application/configs/airtime-conf.php +++ b/legacy/application/configs/airtime-conf.php @@ -1,6 +1,6 @@ [ @@ -18,7 +18,7 @@ $conf = [ ], 'default' => 'airtime', ], - 'generator_version' => '1.7.0', + 'generator_version' => '1.7.3-dev', ]; $conf['classmap'] = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php'; diff --git a/legacy/application/configs/classmap-airtime-conf.php b/legacy/application/configs/classmap-airtime-conf.php index f85d83395..0c8ba1566 100644 --- a/legacy/application/configs/classmap-airtime-conf.php +++ b/legacy/application/configs/classmap-airtime-conf.php @@ -1,6 +1,6 @@ 'airtime/om/BaseCcBlock.php', 'BaseCcBlockPeer' => 'airtime/om/BaseCcBlockPeer.php', @@ -83,9 +83,6 @@ return [ 'BaseCcStreamSetting' => 'airtime/om/BaseCcStreamSetting.php', 'BaseCcStreamSettingPeer' => 'airtime/om/BaseCcStreamSettingPeer.php', 'BaseCcStreamSettingQuery' => 'airtime/om/BaseCcStreamSettingQuery.php', - 'BaseCcTracktypes' => 'airtime/om/BaseCcTracktypes.php', - 'BaseCcTracktypesPeer' => 'airtime/om/BaseCcTracktypesPeer.php', - 'BaseCcTracktypesQuery' => 'airtime/om/BaseCcTracktypesQuery.php', 'BaseCcSubjs' => 'airtime/om/BaseCcSubjs.php', 'BaseCcSubjsPeer' => 'airtime/om/BaseCcSubjsPeer.php', 'BaseCcSubjsQuery' => 'airtime/om/BaseCcSubjsQuery.php', @@ -95,6 +92,9 @@ return [ 'BaseCcTimestamp' => 'airtime/om/BaseCcTimestamp.php', 'BaseCcTimestampPeer' => 'airtime/om/BaseCcTimestampPeer.php', 'BaseCcTimestampQuery' => 'airtime/om/BaseCcTimestampQuery.php', + 'BaseCcTracktypes' => 'airtime/om/BaseCcTracktypes.php', + 'BaseCcTracktypesPeer' => 'airtime/om/BaseCcTracktypesPeer.php', + 'BaseCcTracktypesQuery' => 'airtime/om/BaseCcTracktypesQuery.php', 'BaseCcWebstream' => 'airtime/om/BaseCcWebstream.php', 'BaseCcWebstreamMetadata' => 'airtime/om/BaseCcWebstreamMetadata.php', 'BaseCcWebstreamMetadataPeer' => 'airtime/om/BaseCcWebstreamMetadataPeer.php', @@ -230,10 +230,6 @@ return [ 'CcStreamSettingPeer' => 'airtime/CcStreamSettingPeer.php', 'CcStreamSettingQuery' => 'airtime/CcStreamSettingQuery.php', 'CcStreamSettingTableMap' => 'airtime/map/CcStreamSettingTableMap.php', - 'CcTracktypes' => 'airtime/CcTracktypes.php', - 'CcTracktypesPeer' => 'airtime/CcTracktypesPeer.php', - 'CcTracktypesQuery' => 'airtime/CcTracktypesQuery.php', - 'CcTracktypesTableMap' => 'airtime/map/CcTracktypesTableMap.php', 'CcSubjs' => 'airtime/CcSubjs.php', 'CcSubjsPeer' => 'airtime/CcSubjsPeer.php', 'CcSubjsQuery' => 'airtime/CcSubjsQuery.php', @@ -246,6 +242,10 @@ return [ 'CcTimestampPeer' => 'airtime/CcTimestampPeer.php', 'CcTimestampQuery' => 'airtime/CcTimestampQuery.php', 'CcTimestampTableMap' => 'airtime/map/CcTimestampTableMap.php', + 'CcTracktypes' => 'airtime/CcTracktypes.php', + 'CcTracktypesPeer' => 'airtime/CcTracktypesPeer.php', + 'CcTracktypesQuery' => 'airtime/CcTracktypesQuery.php', + 'CcTracktypesTableMap' => 'airtime/map/CcTracktypesTableMap.php', 'CcWebstream' => 'airtime/CcWebstream.php', 'CcWebstreamMetadata' => 'airtime/CcWebstreamMetadata.php', 'CcWebstreamMetadataPeer' => 'airtime/CcWebstreamMetadataPeer.php', diff --git a/legacy/application/controllers/ApiController.php b/legacy/application/controllers/ApiController.php index 28789b695..56a8d6b8a 100644 --- a/legacy/application/controllers/ApiController.php +++ b/legacy/application/controllers/ApiController.php @@ -1344,7 +1344,7 @@ class ApiController extends Zend_Controller_Action $data = json_decode($request->getParam('data')); foreach ($data as $pair) { - list($id, $gain) = $pair; + [$id, $gain] = $pair; // TODO : move this code into model -- RG $file = Application_Model_StoredFile::RecallById($p_id = $id)->getPropelOrm(); $file->setDbReplayGain($gain); @@ -1360,7 +1360,7 @@ class ApiController extends Zend_Controller_Action $data = json_decode($request->getParam('data'), $assoc = true); foreach ($data as $pair) { - list($id, $info) = $pair; + [$id, $info] = $pair; // TODO : move this code into model -- RG $file = Application_Model_StoredFile::RecallById($p_id = $id)->getPropelOrm(); @@ -1504,7 +1504,7 @@ class ApiController extends Zend_Controller_Action $params = $request->getParams(); $instance = $request->getParam('instance_id', null); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $historyService = new Application_Service_HistoryService(); $results = $historyService->getPlayedItemData($startsDT, $endsDT, $params, $instance); @@ -1528,7 +1528,7 @@ class ApiController extends Zend_Controller_Action $params = $request->getParams(); $userId = $request->getParam('user_id', null); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $historyService = new Application_Service_HistoryService(); $shows = $historyService->getShowList($startsDT, $endsDT, $userId); @@ -1582,7 +1582,7 @@ class ApiController extends Zend_Controller_Action $params = $request->getParams(); $showId = $request->getParam('show_id', null); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); if ((!isset($showId)) || (!is_numeric($showId))) { //if (!isset($showId)) { diff --git a/legacy/application/controllers/LibraryController.php b/legacy/application/controllers/LibraryController.php index 34aa3574a..403063948 100644 --- a/legacy/application/controllers/LibraryController.php +++ b/legacy/application/controllers/LibraryController.php @@ -283,8 +283,8 @@ class LibraryController extends Zend_Controller_Action $newPl->setCreator(Application_Model_User::getCurrentUser()->getId()); $newPl->setDescription($originalPl->getDescription()); - list($plFadeIn) = $originalPl->getFadeInfo(0); - list(, $plFadeOut) = $originalPl->getFadeInfo($originalPl->getSize() - 1); + [$plFadeIn] = $originalPl->getFadeInfo(0); + [, $plFadeOut] = $originalPl->getFadeInfo($originalPl->getSize() - 1); $newPl->setfades($plFadeIn, $plFadeOut); $newPl->setName(sprintf(_('Copy of %s'), $originalPl->getName())); diff --git a/legacy/application/controllers/ListenerstatController.php b/legacy/application/controllers/ListenerstatController.php index d904add23..5e958a9ec 100644 --- a/legacy/application/controllers/ListenerstatController.php +++ b/legacy/application/controllers/ListenerstatController.php @@ -29,7 +29,7 @@ class ListenerstatController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl . 'js/airtime/utilities/utilities.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl . 'css/jquery.ui.timepicker.css?' . $CC_CONFIG['airtime_version']); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); $startsDT->setTimezone($userTimezone); $endsDT->setTimezone($userTimezone); @@ -85,7 +85,7 @@ class ListenerstatController extends Zend_Controller_Action $form = new Application_Form_ShowListenerStat(); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); $startsDT->setTimezone($userTimezone); $endsDT->setTimezone($userTimezone); @@ -101,7 +101,7 @@ class ListenerstatController extends Zend_Controller_Action public function getDataAction() { - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); $data = Application_Model_ListenerStat::getDataPointsWithinRange( $startsDT->format(DEFAULT_TIMESTAMP_FORMAT), $endsDT->format(DEFAULT_TIMESTAMP_FORMAT) @@ -111,7 +111,7 @@ class ListenerstatController extends Zend_Controller_Action public function getShowDataAction() { - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); $show_id = $this->getRequest()->getParam('show_id', null); $data = Application_Model_ListenerStat::getShowDataPointsWithinRange( $startsDT->format(DEFAULT_TIMESTAMP_FORMAT), @@ -123,7 +123,7 @@ class ListenerstatController extends Zend_Controller_Action public function getAllShowData() { - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); return Application_Model_ListenerStat::getAllShowDataPointsWithinRange( $startsDT->format(DEFAULT_TIMESTAMP_FORMAT), @@ -133,7 +133,7 @@ class ListenerstatController extends Zend_Controller_Action public function getAllShowDataAction() { - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); $show_id = $this->getRequest()->getParam('show_id', null); $data = Application_Model_ListenerStat::getAllShowDataPointsWithinRange( $startsDT->format(DEFAULT_TIMESTAMP_FORMAT), diff --git a/legacy/application/controllers/PlayouthistoryController.php b/legacy/application/controllers/PlayouthistoryController.php index 07352b5ba..35a94b70d 100644 --- a/legacy/application/controllers/PlayouthistoryController.php +++ b/legacy/application/controllers/PlayouthistoryController.php @@ -27,7 +27,7 @@ class PlayouthistoryController extends Zend_Controller_Action Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics'); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest()); $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); $startsDT->setTimezone($userTimezone); @@ -83,7 +83,7 @@ class PlayouthistoryController extends Zend_Controller_Action $params = $request->getParams(); $instance = $request->getParam('instance_id', null); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $historyService = new Application_Service_HistoryService(); $r = $historyService->getFileSummaryData($startsDT, $endsDT, $params); @@ -106,7 +106,7 @@ class PlayouthistoryController extends Zend_Controller_Action $params = $request->getParams(); $instance = $request->getParam('instance_id', null); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $historyService = new Application_Service_HistoryService(); $r = $historyService->getPlayedItemData($startsDT, $endsDT, $params, $instance); @@ -129,7 +129,7 @@ class PlayouthistoryController extends Zend_Controller_Action $params = $request->getParams(); $instance = $request->getParam('instance_id', null); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $historyService = new Application_Service_HistoryService(); $shows = $historyService->getShowList($startsDT, $endsDT); diff --git a/legacy/application/controllers/PluploadController.php b/legacy/application/controllers/PluploadController.php index b86739356..dcbdf236f 100644 --- a/legacy/application/controllers/PluploadController.php +++ b/legacy/application/controllers/PluploadController.php @@ -174,7 +174,7 @@ class PluploadController extends Zend_Controller_Action if ($unit) { // Find the position of the unit in the ordered string which is the power // of magnitude to multiply a kilobyte by. - return round($size * pow(1024, stripos('bkmgtpezy', $unit[0]))); + return round($size * 1024 ** stripos('bkmgtpezy', $unit[0])); } return round($size); diff --git a/legacy/application/controllers/ScheduleController.php b/legacy/application/controllers/ScheduleController.php index 37bf23945..1984a033c 100644 --- a/legacy/application/controllers/ScheduleController.php +++ b/legacy/application/controllers/ScheduleController.php @@ -148,11 +148,11 @@ class ScheduleController extends Zend_Controller_Action $calendar_interval = Application_Model_Preference::GetCalendarTimeScale(); if ($calendar_interval == 'agendaDay') { - list($start, $end) = Application_Model_Show::getStartEndCurrentDayView(); + [$start, $end] = Application_Model_Show::getStartEndCurrentDayView(); } elseif ($calendar_interval == 'agendaWeek') { - list($start, $end) = Application_Model_Show::getStartEndCurrentWeekView(); + [$start, $end] = Application_Model_Show::getStartEndCurrentWeekView(); } elseif ($calendar_interval == 'month') { - list($start, $end) = Application_Model_Show::getStartEndCurrentMonthPlusView(); + [$start, $end] = Application_Model_Show::getStartEndCurrentMonthPlusView(); } else { Logging::error("Invalid Calendar Interval '{$calendar_interval}'"); } @@ -487,7 +487,7 @@ class ScheduleController extends Zend_Controller_Action $forms = $this->createShowFormAction(); - list($data, $validateStartDate, $validateStartTime, $originalShowStartDateTime) = + [$data, $validateStartDate, $validateStartTime, $originalShowStartDateTime] = $service_showForm->preEditShowValidationCheck($data); if ($service_showForm->validateShowForms( @@ -548,7 +548,7 @@ class ScheduleController extends Zend_Controller_Action $forms = $this->createShowFormAction(); - list($data, $validateStartDate, $validateStartTime, $originalShowStartDateTime) = + [$data, $validateStartDate, $validateStartTime, $originalShowStartDateTime] = $service_showForm->preEditShowValidationCheck($data); if ($service_showForm->validateShowForms( diff --git a/legacy/application/controllers/ShowbuilderController.php b/legacy/application/controllers/ShowbuilderController.php index e6fe39787..7f0b10a38 100644 --- a/legacy/application/controllers/ShowbuilderController.php +++ b/legacy/application/controllers/ShowbuilderController.php @@ -195,7 +195,7 @@ class ShowbuilderController extends Zend_Controller_Action $timestamp = intval($request->getParam('timestamp', -1)); $instances = $request->getParam('instances', []); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $opts = ['myShows' => $my_shows, 'showFilter' => $show_filter]; $showBuilder = new Application_Model_ShowBuilder($startsDT, $endsDT, $opts); @@ -217,7 +217,7 @@ class ShowbuilderController extends Zend_Controller_Action $show_instance_filter = intval($request->getParam('showInstanceFilter', 0)); $my_shows = intval($request->getParam('myShows', 0)); - list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request); + [$startsDT, $endsDT] = Application_Common_HTTPHelper::getStartEndFromRequest($request); $opts = ['myShows' => $my_shows, 'showFilter' => $show_filter, diff --git a/legacy/application/controllers/WebstreamController.php b/legacy/application/controllers/WebstreamController.php index 8161904e9..cec7776fa 100644 --- a/legacy/application/controllers/WebstreamController.php +++ b/legacy/application/controllers/WebstreamController.php @@ -146,7 +146,7 @@ class WebstreamController extends Zend_Controller_Action return; } - list($analysis, $mime, $mediaUrl, $di) = Application_Model_Webstream::analyzeFormData($parameters); + [$analysis, $mime, $mediaUrl, $di] = Application_Model_Webstream::analyzeFormData($parameters); try { if (Application_Model_Webstream::isValid($analysis)) { diff --git a/legacy/application/controllers/plugins/PageLayoutInitPlugin.php b/legacy/application/controllers/plugins/PageLayoutInitPlugin.php index 2e1bd7b8a..05a8f76ac 100644 --- a/legacy/application/controllers/plugins/PageLayoutInitPlugin.php +++ b/legacy/application/controllers/plugins/PageLayoutInitPlugin.php @@ -118,7 +118,7 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract if (!$csrf_namespace->authtoken) { // If we don't have a token, regenerate it and set a 1 week timeout // Should we log the user out here if the token is expired? - $csrf_namespace->authtoken = sha1(uniqid(rand(), 1)); + $csrf_namespace->authtoken = sha1(uniqid(random_int(0, getrandmax()), 1)); $csrf_namespace->setExpirationSeconds(168 * 60 * 60); } diff --git a/legacy/application/controllers/plugins/RabbitMqPlugin.php b/legacy/application/controllers/plugins/RabbitMqPlugin.php index b9f46d303..15d51afe3 100644 --- a/legacy/application/controllers/plugins/RabbitMqPlugin.php +++ b/legacy/application/controllers/plugins/RabbitMqPlugin.php @@ -9,7 +9,7 @@ class RabbitMqPlugin extends Zend_Controller_Plugin_Abstract Application_Model_RabbitMq::SendMessageToPypo('update_schedule', $md); } - if (memory_get_peak_usage() > 30 * pow(2, 20)) { + if (memory_get_peak_usage() > 30 * 2 ** 20) { Logging::debug('Peak memory usage: ' . (memory_get_peak_usage() / 1000000) . ' MB while accessing URI ' . $_SERVER['REQUEST_URI']); diff --git a/legacy/application/forms/AddShowWhen.php b/legacy/application/forms/AddShowWhen.php index 1a96b35fb..ed71a85c4 100644 --- a/legacy/application/forms/AddShowWhen.php +++ b/legacy/application/forms/AddShowWhen.php @@ -234,7 +234,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm } elseif ($formData['add_show_repeat_type'] == 2 && $formData['add_show_monthly_repeat_type'] == 2) { $interval = 'P1M'; } elseif ($formData['add_show_repeat_type'] == 2 && $formData['add_show_monthly_repeat_type'] == 3) { - list($weekNumberOfMonth, $dayOfWeek) = + [$weekNumberOfMonth, $dayOfWeek] = Application_Service_ShowService::getMonthlyWeeklyRepeatInterval( new DateTime($start_time, $showTimezone) ); diff --git a/legacy/application/forms/Player.php b/legacy/application/forms/Player.php index 6f287792c..261b68d96 100644 --- a/legacy/application/forms/Player.php +++ b/legacy/application/forms/Player.php @@ -59,7 +59,7 @@ class Application_Form_Player extends Zend_Form_SubForm break; } - $streamURL->setAttrib('numberOfEnabledStreams', sizeof($urlOptions) - $opusStreamCount); + $streamURL->setAttrib('numberOfEnabledStreams', count($urlOptions) - $opusStreamCount); $streamURL->removeDecorator('label'); $this->addElement($streamURL); diff --git a/legacy/application/forms/SmartBlockCriteria.php b/legacy/application/forms/SmartBlockCriteria.php index 0166965bd..52e6070b6 100644 --- a/legacy/application/forms/SmartBlockCriteria.php +++ b/legacy/application/forms/SmartBlockCriteria.php @@ -913,7 +913,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $isValid = false; } // length check - if ($d['sp_criteria_value'] >= pow(2, 31)) { + if ($d['sp_criteria_value'] >= 2 ** 31) { $element->addError(_('The value should be less then 2147483648')); $isValid = false; } diff --git a/legacy/application/logging/Logging.php b/legacy/application/logging/Logging.php index 72ee60018..526b08890 100644 --- a/legacy/application/logging/Logging.php +++ b/legacy/application/logging/Logging.php @@ -89,7 +89,6 @@ class Logging //Escape the % symbols in any of our errors because Sentry chokes (vsprint formatting error). $msg = self::toString($p_msg); $msg = str_replace('%', '%%', $msg); - SentryLogger::getInstance()->captureError($msg); } public static function debug($p_msg) diff --git a/legacy/application/logging/SentryLogging.php b/legacy/application/logging/SentryLogging.php deleted file mode 100644 index 76bcb4f38..000000000 --- a/legacy/application/logging/SentryLogging.php +++ /dev/null @@ -1,135 +0,0 @@ -sentryClient = null; - - return; - } - // Instantiate a new client with a compatible DSN - $sentry_config = parse_ini_file(SENTRY_CONFIG_PATH, false); - $dsn = $sentry_config['dsn']; - $this->sentryClient = new Raven_Client( - $dsn, - [ - //FIXME: This doesn't seem to be working... - 'processorOptions' => [ - 'Raven_SanitizeDataProcessor' => [ - 'fields_re' => '/(authorization|password|passwd|user_token|secret|SESSION)/i', - 'values_re' => '/^(?:\d[ -]*?){13,16}$/', - ], - ], - ] - ); - $client = $this->sentryClient; - - /* The Raven docs suggest not enabling these because they're "too noisy". - // Install error handlers and shutdown function to catch fatal errors - $error_handler = new Raven_ErrorHandler($client); - $error_handler->registerExceptionHandler(true); - $error_handler->registerErrorHandler(true); - $error_handler->registerShutdownFunction(true); - */ - $error_handler = new Raven_ErrorHandler($client); - $error_handler->registerExceptionHandler(); - } - - public function captureMessage($msg) - { - if (!$this->sentryClient) { - return; - } - $client = $this->sentryClient; - self::addUserData($client); - self::addTags($client); - - // Capture a message - $event_id = $client->getIdent($client->captureMessage($msg)); - if ($client->getLastError() !== null) { - //printf('There was an error sending the event to Sentry: %s', $client->getLastError()); - } - } - - public function captureException($exception) - { - if (!$this->sentryClient) { - return; - } - - $client = $this->sentryClient; - self::addUserData($client); - self::addTags($client); - - $event_id = $client->getIdent($client->captureException($exception, [ - 'extra' => $this->getExtraData(), - 'tags' => $this->getTags(), - ])); - $client->context->clear(); - } - - public function captureError($errorMessage) - { - if (!$this->sentryClient) { - return; - } - - $client = $this->sentryClient; - - // Provide some additional data with an exception - self::addUserData($client); - self::addTags($client); - $event_id = $client->getIdent($client->captureMessage($errorMessage, [ - 'extra' => $this->getExtraData(), - ])); - $client->context->clear(); - } - - private static function getTags() - { - $tags = []; - $config = Config::getConfig(); - $tags['Development Environment'] = $config['dev_env']; - - return $tags; - } - - private static function addTags($client) - { - $client->tags_context(self::getTags()); - } - - private static function addUserData($client) - { - $userData = []; - $userData['client_id'] = Application_Model_Preference::GetClientId(); - $userData['station_url'] = array_key_exists('SERVER_NAME', $_SERVER) ? $_SERVER['SERVER_NAME'] : ''; - $client->user_context($userData); - } - - /** Extra data to log with Sentry */ - private function getExtraData() - { - $extraData = []; - $extraData['php_version'] = phpversion(); - $extraData['client_id'] = Application_Model_Preference::GetClientId(); - - return $extraData; - } -} diff --git a/legacy/application/models/Auth.php b/legacy/application/models/Auth.php index 032c78256..8322c5e75 100644 --- a/legacy/application/models/Auth.php +++ b/legacy/application/models/Auth.php @@ -126,7 +126,7 @@ class Application_Model_Auth { $string = ''; for ($i = 0; $i < $length; ++$i) { - $string .= $allowed_chars[mt_rand(0, strlen($allowed_chars) - 1)]; + $string .= $allowed_chars[random_int(0, strlen($allowed_chars) - 1)]; } return $string; diff --git a/legacy/application/models/Block.php b/legacy/application/models/Block.php index d461e67ab..a21a1bcad 100644 --- a/legacy/application/models/Block.php +++ b/legacy/application/models/Block.php @@ -331,7 +331,7 @@ SQL; public function getDynamicBlockLength() { - list($value, $modifier) = $this->getLimitValueAndModifier(); + [$value, $modifier] = $this->getLimitValueAndModifier(); if ($modifier == 'items') { $length = $value . ' ' . _('items'); } else { @@ -1200,7 +1200,7 @@ SQL; public function hasItemLimit() { - list($value, $modifier) = $this->getLimitValueAndModifier(); + [$value, $modifier] = $this->getLimitValueAndModifier(); return $modifier == 'items'; } diff --git a/legacy/application/models/Datatables.php b/legacy/application/models/Datatables.php index b08610915..879b4af14 100644 --- a/legacy/application/models/Datatables.php +++ b/legacy/application/models/Datatables.php @@ -20,8 +20,8 @@ class Application_Model_Datatables $input2 = null; } } elseif ($dbname == 'bit_rate' || $dbname == 'sample_rate') { - $input1 = isset($info[0]) ? doubleval($info[0]) * 1000 : null; - $input2 = isset($info[1]) ? doubleval($info[1]) * 1000 : null; + $input1 = isset($info[0]) ? floatval($info[0]) * 1000 : null; + $input2 = isset($info[1]) ? floatval($info[1]) * 1000 : null; } else { $input1 = isset($info[0]) ? $info[0] : null; $input2 = isset($info[1]) ? $info[1] : null; @@ -82,10 +82,10 @@ class Application_Model_Datatables $orig2searchTerm = []; foreach ($data as $key => $d) { if (strstr($key, 'mDataProp_')) { - list($dump, $index) = explode('_', $key); + [$dump, $index] = explode('_', $key); $current2dbname[$index] = $d; } elseif (strstr($key, 'sSearch_')) { - list($dump, $index) = explode('_', $key); + [$dump, $index] = explode('_', $key); $orig2searchTerm[$index] = $d; } } @@ -112,7 +112,7 @@ class Application_Model_Datatables $advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm); if (!empty($advancedWhere['clause'])) { - $where[] = join(' AND ', $advancedWhere['clause']); + $where[] = implode(' AND ', $advancedWhere['clause']); $params = $advancedWhere['params']; } } @@ -122,7 +122,7 @@ class Application_Model_Datatables } $selectorCount = 'SELECT COUNT(*) '; - $selectorRows = 'SELECT ' . join(',', $displayColumns) . ' '; + $selectorRows = 'SELECT ' . implode(',', $displayColumns) . ' '; $sql = $selectorCount . ' FROM ' . $fromTable; $sqlTotalRows = $sql; @@ -157,14 +157,14 @@ class Application_Model_Datatables $orderby[] = $data["mDataProp_{$num}"] . ' ' . $data['sSortDir_' . $i]; } $orderby[] = 'id'; - $orderby = join(',', $orderby); + $orderby = implode(',', $orderby); // End Order By clause $displayLength = intval($data['iDisplayLength']); $needToBind = false; if (count($where) > 0) { $needToBind = true; - $where = join(' OR ', $where); + $where = implode(' OR ', $where); $sql = $selectorCount . ' FROM ' . $fromTable . ' WHERE ' . $where; $sqlTotalDisplayRows = $sql; diff --git a/legacy/application/models/ListenerStat.php b/legacy/application/models/ListenerStat.php index 1624d396a..b189ddd0c 100644 --- a/legacy/application/models/ListenerStat.php +++ b/legacy/application/models/ListenerStat.php @@ -114,11 +114,11 @@ SQL; ); $utcTimezone = new DateTimeZone('UTC'); $displayTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); - if (sizeof($data) > 0) { + if (count($data) > 0) { $t = new DateTime($data[0]['timestamp'], $utcTimezone); $t->setTimezone($displayTimezone); // tricking javascript so it thinks the server timezone is in UTC - $average_listeners = array_sum(array_column($data, 'listeners')) / sizeof($data); + $average_listeners = array_sum(array_column($data, 'listeners')) / count($data); $max_num_listeners = max(array_column($data, 'listeners')); $entry = ['show' => $showName, 'time' => $t->format('Y-m-d H:i:s'), 'average_number_of_listeners' => $average_listeners, 'maximum_number_of_listeners' => $max_num_listeners, ]; diff --git a/legacy/application/models/LiveLog.php b/legacy/application/models/LiveLog.php index 2eca8f3b0..534421622 100644 --- a/legacy/application/models/LiveLog.php +++ b/legacy/application/models/LiveLog.php @@ -59,7 +59,7 @@ class Application_Model_LiveLog $duration = $start->diff($end); $duration = $duration->format('%H:%i:%s'); $intervals = explode(':', $duration); - for ($i = 0; $i < sizeof($intervals); ++$i) { + for ($i = 0; $i < count($intervals); ++$i) { if (!isset($intervals[$i])) { $intervals[$i] = 0; } @@ -199,7 +199,7 @@ class Application_Model_LiveLog $clip_length = $track['clip_length']; //Convert clip_length into seconds $clip_length_intervals = explode(':', $clip_length); - for ($i = 0; $i < sizeof($clip_length_intervals); ++$i) { + for ($i = 0; $i < count($clip_length_intervals); ++$i) { if (!isset($clip_length_intervals[$i])) { $clip_length_intervals[$i] = 0; } @@ -209,7 +209,7 @@ class Application_Model_LiveLog $extra_time = $extra_time->format('%H:%i:%s'); //Convert extra_time into seconds; $extra_time_intervals = explode(':', $extra_time); - for ($i = 0; $i < sizeof($extra_time_intervals); ++$i) { + for ($i = 0; $i < count($extra_time_intervals); ++$i) { if (!isset($extra_time_intervals[$i])) { $extra_time_intervals[$i] = 0; } @@ -240,7 +240,7 @@ class Application_Model_LiveLog } $intervals = explode(':', $clip_length); - for ($i = 0; $i < sizeof($intervals); ++$i) { + for ($i = 0; $i < count($intervals); ++$i) { if (!isset($intervals[$i])) { $intervals[$i] = 0; } diff --git a/legacy/application/models/Schedule.php b/legacy/application/models/Schedule.php index 7b673c1c0..9d579b0df 100644 --- a/legacy/application/models/Schedule.php +++ b/legacy/application/models/Schedule.php @@ -886,8 +886,8 @@ SQL; $start = self::AirtimeTimeToPypoTime($item['start']); $end = self::AirtimeTimeToPypoTime($item['end']); - list(, , , $start_hour) = explode('-', $start); - list(, , , $end_hour) = explode('-', $end); + [, , , $start_hour] = explode('-', $start); + [, , , $end_hour] = explode('-', $end); $same_hour = $start_hour == $end_hour; $independent_event = !$same_hour; @@ -1139,7 +1139,7 @@ SQL; $needScheduleUntil->add(new DateInterval('P1D')); } Application_Model_Show::createAndFillShowInstancesPastPopulatedUntilDate($needScheduleUntil); - list($range_start, $range_end) = self::getRangeStartAndEnd($p_fromDateTime, $p_toDateTime); + [$range_start, $range_end] = self::getRangeStartAndEnd($p_fromDateTime, $p_toDateTime); $data = []; $data['media'] = []; diff --git a/legacy/application/models/Scheduler.php b/legacy/application/models/Scheduler.php index 759996271..5f8891170 100644 --- a/legacy/application/models/Scheduler.php +++ b/legacy/application/models/Scheduler.php @@ -991,7 +991,7 @@ final class Application_Model_Scheduler $insert_sql = 'INSERT INTO cc_schedule ' . '(starts, ends, cue_in, cue_out, fade_in, fade_out, ' . 'clip_length, position, instance_id, file_id, stream_id) VALUES ' . - implode($values, ',') . ' RETURNING id'; + implode(',', $values) . ' RETURNING id'; $stmt = $this->con->prepare($insert_sql); if ($stmt->execute()) { @@ -1020,7 +1020,7 @@ final class Application_Model_Scheduler "WHERE starts >= '{$initalStartDT->format(DEFAULT_MICROTIME_FORMAT)}' " . "AND instance_id = {$instanceId} "; if (count($excludeIds) > 0) { - $followingItems_sql .= 'AND id NOT IN (' . implode($excludeIds, ',') . ') '; + $followingItems_sql .= 'AND id NOT IN (' . implode(',', $excludeIds) . ') '; } $followingItems_sql .= 'ORDER BY starts'; $followingSchedItems = Application_Common_Database::prepareAndExecute( diff --git a/legacy/application/models/Show.php b/legacy/application/models/Show.php index 9961b0595..9d7a0894d 100644 --- a/legacy/application/models/Show.php +++ b/legacy/application/models/Show.php @@ -353,7 +353,7 @@ SQL; $sql_gen = 'UPDATE cc_show_instances ' . 'SET ends = (ends + :deltaDay1::INTERVAL + :interval1::INTERVAL) ' . - 'WHERE (id IN (' . implode($instanceIds, ',') . ') ' . + 'WHERE (id IN (' . implode(',', $instanceIds) . ') ' . 'AND ends > :current_timestamp1) ' . "AND ((ends + :deltaDay2::INTERVAL + :interval2::INTERVAL - starts) <= interval '24:00')"; @@ -371,7 +371,7 @@ SQL; $sql_gen = 'UPDATE cc_show_days ' . 'SET duration = (CAST(duration AS interval) + :deltaDay3::INTERVAL + :interval3::INTERVAL) ' . - 'WHERE id IN (' . implode($showDayIds, ',') . ') ' . + 'WHERE id IN (' . implode(',', $showDayIds) . ') ' . "AND ((CAST(duration AS interval) + :deltaDay4::INTERVAL + :interval4::INTERVAL) <= interval '24:00')"; Application_Common_Database::prepareAndExecute( @@ -671,7 +671,7 @@ SQL; */ public function getStartDate() { - list($date) = explode(' ', $this->getStartDateAndTime()); + [$date] = explode(' ', $this->getStartDateAndTime()); return $date; } @@ -684,7 +684,7 @@ SQL; */ public function getStartTime() { - list(, $time) = explode(' ', $this->getStartDateAndTime()); + [, $time] = explode(' ', $this->getStartDateAndTime()); return $time; } @@ -1214,9 +1214,9 @@ SQL; } //$hashValue = (md5($date->format('d'))[0] % $cols) + ((intval($date->format('h'))/24) % $rows); - $row = intval($date->format('w')) % sizeof($palette); + $row = intval($date->format('w')) % count($palette); $foo = $date->format('H'); - $col = intval(intval($date->format('H')) / 24.0 * sizeof($palette[0])); + $col = intval(intval($date->format('H')) / 24.0 * count($palette[0])); //$color = $palette[$hashValue % sizeof($palette)]; return $palette[$row][$col]; } diff --git a/legacy/application/models/StoredFile.php b/legacy/application/models/StoredFile.php index 1a6958e62..288fc5b3c 100644 --- a/legacy/application/models/StoredFile.php +++ b/legacy/application/models/StoredFile.php @@ -803,10 +803,10 @@ SQL; } } - $plSelect = 'SELECT ' . join(',', $plSelect); - $blSelect = 'SELECT ' . join(',', $blSelect); - $fileSelect = 'SELECT ' . join(',', $fileSelect); - $streamSelect = 'SELECT ' . join(',', $streamSelect); + $plSelect = 'SELECT ' . implode(',', $plSelect); + $blSelect = 'SELECT ' . implode(',', $blSelect); + $fileSelect = 'SELECT ' . implode(',', $fileSelect); + $streamSelect = 'SELECT ' . implode(',', $streamSelect); $type = intval($datatables['type']); diff --git a/legacy/application/models/Tracktype.php b/legacy/application/models/Tracktype.php index 650b94e0c..c3d921fa1 100644 --- a/legacy/application/models/Tracktype.php +++ b/legacy/application/models/Tracktype.php @@ -110,7 +110,7 @@ class Application_Model_Tracktype $params[$p] = $visible[$i]; } - $sql_type = join(' OR ', $visibility); + $sql_type = implode(' OR ', $visibility); $sql = $sql_gen . ' WHERE (' . $sql_type . ') '; diff --git a/legacy/application/models/User.php b/legacy/application/models/User.php index 6318ca2dc..eb46e04f1 100644 --- a/legacy/application/models/User.php +++ b/legacy/application/models/User.php @@ -301,7 +301,7 @@ class Application_Model_User $params[$p] = $type[$i]; } - $sql_type = join(' OR ', $types); + $sql_type = implode(' OR ', $types); $sql = $sql_gen . ' WHERE (' . $sql_type . ') '; diff --git a/legacy/application/models/Webstream.php b/legacy/application/models/Webstream.php index 7de28c0cf..f74b9b748 100644 --- a/legacy/application/models/Webstream.php +++ b/legacy/application/models/Webstream.php @@ -47,7 +47,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable $dateString = $this->webstream->getDbLength(); $arr = explode(':', $dateString); if (count($arr) == 3) { - list($hours, $min, $sec) = $arr; + [$hours, $min, $sec] = $arr; $di = new DateInterval("PT{$hours}H{$min}M{$sec}S"); return $di->format('%Hh %Im'); @@ -183,14 +183,14 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable $valid['url'][1] = _('URL should be 512 characters or less'); } else { try { - list($mime, $content_length_found) = self::discoverStreamMime($url); + [$mime, $content_length_found] = self::discoverStreamMime($url); if (is_null($mime)) { throw new Exception(_('No MIME type found for webstream.')); } $mediaUrl = self::getMediaUrl($url, $mime, $content_length_found); if (preg_match('/(x-mpegurl)|(xspf\+xml)|(pls\+xml)|(x-scpls)/', $mime)) { - list($mime, $content_length_found) = self::discoverStreamMime($mediaUrl); + [$mime, $content_length_found] = self::discoverStreamMime($mediaUrl); } } catch (Exception $e) { $valid['url'][0] = false; @@ -384,7 +384,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable $headers = self::cleanHeaders($headers); foreach ($headers as $h) { if (preg_match('/^content-type:/i', $h)) { - list(, $value) = explode(':', $h, 2); + [, $value] = explode(':', $h, 2); $mime = trim($value); } if (preg_match('/^content-length:/i', $h)) { diff --git a/legacy/application/models/airtime/CcFiles.php b/legacy/application/models/airtime/CcFiles.php index 9773f54c0..dc4e820cd 100644 --- a/legacy/application/models/airtime/CcFiles.php +++ b/legacy/application/models/airtime/CcFiles.php @@ -340,7 +340,7 @@ class CcFiles extends BaseCcFiles public function setDbTrackNumber($v) { - $max = pow(2, 31) - 1; + $max = 2 ** 31 - 1; $v = ($v > $max) ? $max : $v; return parent::setDbTrackNumber($v); diff --git a/legacy/application/models/airtime/map/CcTracktypesTableMap.php b/legacy/application/models/airtime/map/CcTracktypesTableMap.php index f79672407..b1a273762 100644 --- a/legacy/application/models/airtime/map/CcTracktypesTableMap.php +++ b/legacy/application/models/airtime/map/CcTracktypesTableMap.php @@ -1,5 +1,7 @@ setPrimaryKeyMethodInfo('cc_track_types_id_seq'); // columns $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null); - $this->addColumn('code', 'DbCode', 'VARCHAR', true, 255, ''); - $this->addColumn('visibility', 'DbVisibility', 'BOOLEAN', true, 1, true); - $this->addColumn('type_name', 'DbTypeName', 'VARCHAR', true, 255, ''); + $this->addColumn('code', 'DbCode', 'VARCHAR', true, 16, ''); + $this->addColumn('visibility', 'DbVisibility', 'BOOLEAN', true, null, true); + $this->addColumn('type_name', 'DbTypeName', 'VARCHAR', true, 64, ''); $this->addColumn('description', 'DbDescription', 'VARCHAR', true, 255, ''); // validators } // initialize() @@ -50,7 +52,6 @@ class CcTracktypesTableMap extends TableMap */ public function buildRelations() { - } // buildRelations() } // CcTracktypesTableMap diff --git a/legacy/application/models/airtime/om/BaseCcBlock.php b/legacy/application/models/airtime/om/BaseCcBlock.php index 236d3542d..13260f75b 100644 --- a/legacy/application/models/airtime/om/BaseCcBlock.php +++ b/legacy/application/models/airtime/om/BaseCcBlock.php @@ -75,7 +75,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent /** * The value for the type field. - * Note: this column has a database default value of: 'static' + * Note: this column has a database default value of: 'dynamic' * @var string */ protected $type; @@ -151,7 +151,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent { $this->name = ''; $this->length = '00:00:00'; - $this->type = 'static'; + $this->type = 'dynamic'; } /** @@ -329,7 +329,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -421,7 +421,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -442,7 +442,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent */ public function setDbLength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -463,7 +463,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent */ public function setDbType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -494,7 +494,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent return false; } - if ($this->type !== 'static') { + if ($this->type !== 'dynamic') { return false; } diff --git a/legacy/application/models/airtime/om/BaseCcBlockcontents.php b/legacy/application/models/airtime/om/BaseCcBlockcontents.php index 0729979ab..062773587 100644 --- a/legacy/application/models/airtime/om/BaseCcBlockcontents.php +++ b/legacy/application/models/airtime/om/BaseCcBlockcontents.php @@ -433,7 +433,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent */ public function setDbCliplength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -454,7 +454,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent */ public function setDbCuein($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -475,7 +475,7 @@ abstract class BaseCcBlockcontents extends BaseObject implements Persistent */ public function setDbCueout($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcBlockcriteria.php b/legacy/application/models/airtime/om/BaseCcBlockcriteria.php index a1b663a73..102556dc9 100644 --- a/legacy/application/models/airtime/om/BaseCcBlockcriteria.php +++ b/legacy/application/models/airtime/om/BaseCcBlockcriteria.php @@ -202,7 +202,7 @@ abstract class BaseCcBlockcriteria extends BaseObject implements Persistent */ public function setDbCriteria($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -223,7 +223,7 @@ abstract class BaseCcBlockcriteria extends BaseObject implements Persistent */ public function setDbModifier($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -244,7 +244,7 @@ abstract class BaseCcBlockcriteria extends BaseObject implements Persistent */ public function setDbValue($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -265,7 +265,7 @@ abstract class BaseCcBlockcriteria extends BaseObject implements Persistent */ public function setDbExtra($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcCountry.php b/legacy/application/models/airtime/om/BaseCcCountry.php index dee0b4a90..6512416c0 100644 --- a/legacy/application/models/airtime/om/BaseCcCountry.php +++ b/legacy/application/models/airtime/om/BaseCcCountry.php @@ -91,7 +91,7 @@ abstract class BaseCcCountry extends BaseObject implements Persistent */ public function setDbIsoCode($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -112,7 +112,7 @@ abstract class BaseCcCountry extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcFiles.php b/legacy/application/models/airtime/om/BaseCcFiles.php index c22b9535b..d7c338e61 100644 --- a/legacy/application/models/airtime/om/BaseCcFiles.php +++ b/legacy/application/models/airtime/om/BaseCcFiles.php @@ -288,18 +288,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ protected $info_url; - /** - * The value for the artwork field. - * @var string - */ - protected $artwork; - - /** - * The value for the track_type field. - * @var string - */ - protected $track_type; - /** * The value for the artist_url field. * @var string @@ -458,6 +446,18 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ protected $description; + /** + * The value for the artwork field. + * @var string + */ + protected $artwork; + + /** + * The value for the track_type field. + * @var string + */ + protected $track_type; + /** * @var CcSubjs */ @@ -1158,28 +1158,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this->info_url; } - /** - * Get the [artwork] column value. - * - * @return string - */ - public function getDbArtwork() - { - - return $this->artwork; - } - - /** - * Get the [track_type] column value. - * - * @return string - */ - public function getDbTrackType() - { - - return $this->track_type; - } - /** * Get the [artist_url] column value. * @@ -1455,6 +1433,28 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this->description; } + /** + * Get the [artwork] column value. + * + * @return string + */ + public function getDbArtwork() + { + + return $this->artwork; + } + + /** + * Get the [track_type] column value. + * + * @return string + */ + public function getDbTrackType() + { + + return $this->track_type; + } + /** * Set the value of [id] column. * @@ -1484,7 +1484,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1505,7 +1505,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbMime($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1526,7 +1526,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbFtype($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1572,7 +1572,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbFilepath($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1729,7 +1729,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbMd5($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1750,7 +1750,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbTrackTitle($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1763,46 +1763,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this; } // setDbTrackTitle() - /** - * Set the value of [artwork] column. - * - * @param string $v new value - * @return CcFiles The current object (for fluent API support) - */ - public function setDbArtwork($v) - { - if ($v !== null && is_numeric($v)) { - $v = (string) $v; - } - - if ($this->artwork !== $v) { - $this->artwork = $v; - $this->modifiedColumns[] = CcFilesPeer::ARTWORK; - } - - return $this; - } // setDbArtwork() - - /** - * Set the value of [track_type] column. - * - * @param string $v new value - * @return CcFiles The current object (for fluent API support) - */ - public function setDbTrackType($v) - { - if ($v !== null && is_numeric($v)) { - $v = (string) $v; - } - - if ($this->track_type !== $v) { - $this->track_type = $v; - $this->modifiedColumns[] = CcFilesPeer::TRACK_TYPE; - } - - return $this; - } // setDbTrackType() - /** * Set the value of [artist_name] column. * @@ -1811,7 +1771,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbArtistName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1874,7 +1834,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbFormat($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1895,7 +1855,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbLength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1916,7 +1876,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbAlbumTitle($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1937,7 +1897,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbGenre($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1958,7 +1918,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbComments($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -1979,7 +1939,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbYear($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2042,7 +2002,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2084,7 +2044,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbRating($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2105,7 +2065,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbEncodedBy($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2126,7 +2086,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbDiscNumber($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2147,7 +2107,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbMood($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2168,7 +2128,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbLabel($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2189,7 +2149,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbComposer($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2210,7 +2170,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbEncoder($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2231,7 +2191,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbChecksum($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2252,7 +2212,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbLyrics($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2273,7 +2233,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbOrchestra($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2294,7 +2254,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbConductor($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2315,7 +2275,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbLyricist($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2336,7 +2296,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbOriginalLyricist($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2357,7 +2317,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbRadioStationName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2378,7 +2338,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbInfoUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2399,7 +2359,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbArtistUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2420,7 +2380,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbAudioSourceUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2441,7 +2401,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbRadioStationUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2462,7 +2422,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbBuyThisUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2483,7 +2443,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbIsrcNumber($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2504,7 +2464,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbCatalogNumber($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2525,7 +2485,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbOriginalArtist($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2546,7 +2506,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbCopyright($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2567,7 +2527,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbReportDatetime($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2588,7 +2548,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbReportLocation($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2609,7 +2569,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbReportOrganization($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2630,7 +2590,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbSubject($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2651,7 +2611,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbContributor($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2672,7 +2632,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbLanguage($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2768,7 +2728,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbCuein($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2789,7 +2749,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbCueout($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2947,7 +2907,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -2960,6 +2920,48 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this; } // setDbDescription() + /** + * Set the value of [artwork] column. + * + * @param string $v new value + * @return CcFiles The current object (for fluent API support) + */ + public function setDbArtwork($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->artwork !== $v) { + $this->artwork = $v; + $this->modifiedColumns[] = CcFilesPeer::ARTWORK; + } + + + return $this; + } // setDbArtwork() + + /** + * Set the value of [track_type] column. + * + * @param string $v new value + * @return CcFiles The current object (for fluent API support) + */ + public function setDbTrackType($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->track_type !== $v) { + $this->track_type = $v; + $this->modifiedColumns[] = CcFilesPeer::TRACK_TYPE; + } + + + return $this; + } // setDbTrackType() + /** * Indicates whether the columns in this object are only set to default values. * diff --git a/legacy/application/models/airtime/om/BaseCcFilesQuery.php b/legacy/application/models/airtime/om/BaseCcFilesQuery.php index 4672ffc31..f10d96d03 100644 --- a/legacy/application/models/airtime/om/BaseCcFilesQuery.php +++ b/legacy/application/models/airtime/om/BaseCcFilesQuery.php @@ -1925,64 +1925,6 @@ abstract class BaseCcFilesQuery extends ModelCriteria return $this->addUsingAlias(CcFilesPeer::INFO_URL, $dbInfoUrl, $comparison); } - /** - * Filter the query on the artwork column - * - * Example usage: - * - * $query->filterByDbArtwork('fooValue'); // WHERE artwork = 'fooValue' - * $query->filterByDbArtwork('%fooValue%'); // WHERE artwork LIKE '%fooValue%' - * - * - * @param string $dbArtwork The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return CcFilesQuery The current query, for fluid interface - */ - public function filterByDbArtwork($dbArtwork = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($dbArtwork)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $dbArtwork)) { - $dbArtwork = str_replace('*', '%', $dbArtwork); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CcFilesPeer::ARTWORK, $dbArtwork, $comparison); - } - - /** - * Filter the query on the track_type column - * - * Example usage: - * - * $query->filterByDbTrackType('fooValue'); // WHERE track_type = 'fooValue' - * $query->filterByDbTrackType('%fooValue%'); // WHERE track_type LIKE '%fooValue%' - * - * - * @param string $dbTrackType The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return CcFilesQuery The current query, for fluid interface - */ - public function filterByDbTrackType($dbTrackType = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($dbTrackType)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $dbTrackType)) { - $dbTrackType = str_replace('*', '%', $dbTrackType); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CcFilesPeer::TRACK_TYPE, $dbTrackType, $comparison); - } - /** * Filter the query on the artist_url column * @@ -2739,6 +2681,64 @@ abstract class BaseCcFilesQuery extends ModelCriteria return $this->addUsingAlias(CcFilesPeer::DESCRIPTION, $dbDescription, $comparison); } + /** + * Filter the query on the artwork column + * + * Example usage: + * + * $query->filterByDbArtwork('fooValue'); // WHERE artwork = 'fooValue' + * $query->filterByDbArtwork('%fooValue%'); // WHERE artwork LIKE '%fooValue%' + * + * + * @param string $dbArtwork The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CcFilesQuery The current query, for fluid interface + */ + public function filterByDbArtwork($dbArtwork = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbArtwork)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbArtwork)) { + $dbArtwork = str_replace('*', '%', $dbArtwork); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CcFilesPeer::ARTWORK, $dbArtwork, $comparison); + } + + /** + * Filter the query on the track_type column + * + * Example usage: + * + * $query->filterByDbTrackType('fooValue'); // WHERE track_type = 'fooValue' + * $query->filterByDbTrackType('%fooValue%'); // WHERE track_type LIKE '%fooValue%' + * + * + * @param string $dbTrackType The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CcFilesQuery The current query, for fluid interface + */ + public function filterByDbTrackType($dbTrackType = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbTrackType)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbTrackType)) { + $dbTrackType = str_replace('*', '%', $dbTrackType); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CcFilesPeer::TRACK_TYPE, $dbTrackType, $comparison); + } + /** * Filter the query by a related CcSubjs object * diff --git a/legacy/application/models/airtime/om/BaseCcLiveLog.php b/legacy/application/models/airtime/om/BaseCcLiveLog.php index cacb87395..0296c37cb 100644 --- a/legacy/application/models/airtime/om/BaseCcLiveLog.php +++ b/legacy/application/models/airtime/om/BaseCcLiveLog.php @@ -194,7 +194,7 @@ abstract class BaseCcLiveLog extends BaseObject implements Persistent */ public function setDbState($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcLoginAttempts.php b/legacy/application/models/airtime/om/BaseCcLoginAttempts.php index bccc85ab1..07647a94c 100644 --- a/legacy/application/models/airtime/om/BaseCcLoginAttempts.php +++ b/legacy/application/models/airtime/om/BaseCcLoginAttempts.php @@ -113,7 +113,7 @@ abstract class BaseCcLoginAttempts extends BaseObject implements Persistent */ public function setDbIP($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcMountName.php b/legacy/application/models/airtime/om/BaseCcMountName.php index 6917ae1ef..85c9d87d6 100644 --- a/legacy/application/models/airtime/om/BaseCcMountName.php +++ b/legacy/application/models/airtime/om/BaseCcMountName.php @@ -124,7 +124,7 @@ abstract class BaseCcMountName extends BaseObject implements Persistent */ public function setDbMountName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcMusicDirs.php b/legacy/application/models/airtime/om/BaseCcMusicDirs.php index 97718b729..2a34925b7 100644 --- a/legacy/application/models/airtime/om/BaseCcMusicDirs.php +++ b/legacy/application/models/airtime/om/BaseCcMusicDirs.php @@ -199,7 +199,7 @@ abstract class BaseCcMusicDirs extends BaseObject implements Persistent */ public function setDirectory($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -220,7 +220,7 @@ abstract class BaseCcMusicDirs extends BaseObject implements Persistent */ public function setType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPerms.php b/legacy/application/models/airtime/om/BaseCcPerms.php index edb76be71..ab3d0b120 100644 --- a/legacy/application/models/airtime/om/BaseCcPerms.php +++ b/legacy/application/models/airtime/om/BaseCcPerms.php @@ -193,7 +193,7 @@ abstract class BaseCcPerms extends BaseObject implements Persistent */ public function setAction($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -235,7 +235,7 @@ abstract class BaseCcPerms extends BaseObject implements Persistent */ public function setType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPlaylist.php b/legacy/application/models/airtime/om/BaseCcPlaylist.php index ee2e4269c..83f4ce55b 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylist.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylist.php @@ -298,7 +298,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -390,7 +390,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -411,7 +411,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent */ public function setDbLength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPlaylistcontents.php b/legacy/application/models/airtime/om/BaseCcPlaylistcontents.php index b0552a756..b09500d9d 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylistcontents.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylistcontents.php @@ -558,7 +558,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function setDbCliplength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -579,7 +579,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function setDbCuein($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -600,7 +600,7 @@ abstract class BaseCcPlaylistcontents extends BaseObject implements Persistent */ public function setDbCueout($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaData.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaData.php index 84747072b..fc743a93d 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaData.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaData.php @@ -176,7 +176,7 @@ abstract class BaseCcPlayoutHistoryMetaData extends BaseObject implements Persis */ public function setDbKey($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -197,7 +197,7 @@ abstract class BaseCcPlayoutHistoryMetaData extends BaseObject implements Persis */ public function setDbValue($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php index 6a2b9230f..562d0b5c8 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php @@ -141,7 +141,7 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -162,7 +162,7 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis */ public function setDbType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateField.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateField.php index 7148c270d..5be444816 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateField.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateField.php @@ -249,7 +249,7 @@ abstract class BaseCcPlayoutHistoryTemplateField extends BaseObject implements P */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -270,7 +270,7 @@ abstract class BaseCcPlayoutHistoryTemplateField extends BaseObject implements P */ public function setDbLabel($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -291,7 +291,7 @@ abstract class BaseCcPlayoutHistoryTemplateField extends BaseObject implements P */ public function setDbType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcPref.php b/legacy/application/models/airtime/om/BaseCcPref.php index ce56f1f30..75aa898cd 100644 --- a/legacy/application/models/airtime/om/BaseCcPref.php +++ b/legacy/application/models/airtime/om/BaseCcPref.php @@ -176,7 +176,7 @@ abstract class BaseCcPref extends BaseObject implements Persistent */ public function setKeystr($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -197,7 +197,7 @@ abstract class BaseCcPref extends BaseObject implements Persistent */ public function setValstr($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcSchedule.php b/legacy/application/models/airtime/om/BaseCcSchedule.php index 1bc842b13..3655fb011 100644 --- a/legacy/application/models/airtime/om/BaseCcSchedule.php +++ b/legacy/application/models/airtime/om/BaseCcSchedule.php @@ -586,7 +586,7 @@ abstract class BaseCcSchedule extends BaseObject implements Persistent */ public function setDbClipLength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -657,7 +657,7 @@ abstract class BaseCcSchedule extends BaseObject implements Persistent */ public function setDbCueIn($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -678,7 +678,7 @@ abstract class BaseCcSchedule extends BaseObject implements Persistent */ public function setDbCueOut($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcServiceRegister.php b/legacy/application/models/airtime/om/BaseCcServiceRegister.php index 20ba3c962..a8ca1ff78 100644 --- a/legacy/application/models/airtime/om/BaseCcServiceRegister.php +++ b/legacy/application/models/airtime/om/BaseCcServiceRegister.php @@ -91,7 +91,7 @@ abstract class BaseCcServiceRegister extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -112,7 +112,7 @@ abstract class BaseCcServiceRegister extends BaseObject implements Persistent */ public function setDbIp($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcSess.php b/legacy/application/models/airtime/om/BaseCcSess.php index 692f742ca..0981b5339 100644 --- a/legacy/application/models/airtime/om/BaseCcSess.php +++ b/legacy/application/models/airtime/om/BaseCcSess.php @@ -154,7 +154,7 @@ abstract class BaseCcSess extends BaseObject implements Persistent */ public function setSessid($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -200,7 +200,7 @@ abstract class BaseCcSess extends BaseObject implements Persistent */ public function setLogin($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcShow.php b/legacy/application/models/airtime/om/BaseCcShow.php index 5699f4856..470c78205 100644 --- a/legacy/application/models/airtime/om/BaseCcShow.php +++ b/legacy/application/models/airtime/om/BaseCcShow.php @@ -460,7 +460,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -481,7 +481,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -502,7 +502,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbGenre($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -523,7 +523,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -544,7 +544,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbColor($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -565,7 +565,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbBackgroundColor($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -644,7 +644,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbLiveStreamUser($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -665,7 +665,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbLiveStreamPass($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -744,7 +744,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent */ public function setDbImagePath($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcShowDays.php b/legacy/application/models/airtime/om/BaseCcShowDays.php index 8a13db98b..08e67d611 100644 --- a/legacy/application/models/airtime/om/BaseCcShowDays.php +++ b/legacy/application/models/airtime/om/BaseCcShowDays.php @@ -457,7 +457,7 @@ abstract class BaseCcShowDays extends BaseObject implements Persistent */ public function setDbTimezone($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -478,7 +478,7 @@ abstract class BaseCcShowDays extends BaseObject implements Persistent */ public function setDbDuration($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcShowInstances.php b/legacy/application/models/airtime/om/BaseCcShowInstances.php index ba63c6c89..f4ee7c18e 100644 --- a/legacy/application/models/airtime/om/BaseCcShowInstances.php +++ b/legacy/application/models/airtime/om/BaseCcShowInstances.php @@ -495,7 +495,7 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -679,7 +679,7 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent */ public function setDbTimeFilled($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcShowRebroadcast.php b/legacy/application/models/airtime/om/BaseCcShowRebroadcast.php index efbeba873..407f9a69f 100644 --- a/legacy/application/models/airtime/om/BaseCcShowRebroadcast.php +++ b/legacy/application/models/airtime/om/BaseCcShowRebroadcast.php @@ -175,7 +175,7 @@ abstract class BaseCcShowRebroadcast extends BaseObject implements Persistent */ public function setDbDayOffset($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcStreamSetting.php b/legacy/application/models/airtime/om/BaseCcStreamSetting.php index f579be6a1..c9aa761f7 100644 --- a/legacy/application/models/airtime/om/BaseCcStreamSetting.php +++ b/legacy/application/models/airtime/om/BaseCcStreamSetting.php @@ -108,7 +108,7 @@ abstract class BaseCcStreamSetting extends BaseObject implements Persistent */ public function setDbKeyName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -129,7 +129,7 @@ abstract class BaseCcStreamSetting extends BaseObject implements Persistent */ public function setDbValue($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -150,7 +150,7 @@ abstract class BaseCcStreamSetting extends BaseObject implements Persistent */ public function setDbType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcSubjs.php b/legacy/application/models/airtime/om/BaseCcSubjs.php index 1368aafa5..b7d08899b 100644 --- a/legacy/application/models/airtime/om/BaseCcSubjs.php +++ b/legacy/application/models/airtime/om/BaseCcSubjs.php @@ -499,7 +499,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbLogin($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -520,7 +520,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbPass($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -541,7 +541,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbType($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -562,7 +562,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbFirstName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -583,7 +583,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbLastName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -650,7 +650,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbSkypeContact($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -671,7 +671,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbJabberContact($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -692,7 +692,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbEmail($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -713,7 +713,7 @@ abstract class BaseCcSubjs extends BaseObject implements Persistent */ public function setDbCellPhone($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcSubjsToken.php b/legacy/application/models/airtime/om/BaseCcSubjsToken.php index f1c3b4bef..ca6f25490 100644 --- a/legacy/application/models/airtime/om/BaseCcSubjsToken.php +++ b/legacy/application/models/airtime/om/BaseCcSubjsToken.php @@ -217,7 +217,7 @@ abstract class BaseCcSubjsToken extends BaseObject implements Persistent */ public function setDbAction($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -238,7 +238,7 @@ abstract class BaseCcSubjsToken extends BaseObject implements Persistent */ public function setDbToken($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcTracktypes.php b/legacy/application/models/airtime/om/BaseCcTracktypes.php index 2828284b7..6d5069b7b 100644 --- a/legacy/application/models/airtime/om/BaseCcTracktypes.php +++ b/legacy/application/models/airtime/om/BaseCcTracktypes.php @@ -1,5 +1,6 @@ modifiedColumns[] = CcTracktypesPeer::ID; } + return $this; } // setDbId() @@ -189,7 +191,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent */ public function setDbCode($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -198,19 +200,28 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $this->modifiedColumns[] = CcTracktypesPeer::CODE; } + return $this; } // setDbCode() /** - * Set the value of [visibility] column. + * Sets the value of the [visibility] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * - * @param string $v new value + * @param boolean|integer|string $v The new value * @return CcTracktypes The current object (for fluent API support) */ public function setDbVisibility($v) { - if ($v !== null && is_numeric($v)) { - $v = (string) $v; + if ($v !== null) { + if (is_string($v)) { + $v = in_array(strtolower($v), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } else { + $v = (boolean) $v; + } } if ($this->visibility !== $v) { @@ -218,6 +229,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $this->modifiedColumns[] = CcTracktypesPeer::VISIBILITY; } + return $this; } // setDbVisibility() @@ -229,7 +241,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent */ public function setDbTypeName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -238,6 +250,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $this->modifiedColumns[] = CcTracktypesPeer::TYPE_NAME; } + return $this; } // setDbTypeName() @@ -249,7 +262,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -258,6 +271,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $this->modifiedColumns[] = CcTracktypesPeer::DESCRIPTION; } + return $this; } // setDbDescription() @@ -275,7 +289,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent return false; } - if ($this->visibility !== '1') { + if ($this->visibility !== true) { return false; } @@ -311,7 +325,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null; $this->code = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null; - $this->visibility = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null; + $this->visibility = ($row[$startcol + 2] !== null) ? (boolean) $row[$startcol + 2] : null; $this->type_name = ($row[$startcol + 3] !== null) ? (string) $row[$startcol + 3] : null; $this->description = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null; $this->resetModified(); @@ -383,6 +397,9 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent } $this->hydrate($row, 0, true); // rehydrate + if ($deep) { // also de-associate any related objects? + + } // if (deep) } /** @@ -674,6 +691,8 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $failureMap = array_merge($failureMap, $retval); } + + $this->alreadyInValidation = false; } @@ -740,11 +759,10 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to true. * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. * * @return array an associative array containing the field names (as keys) and field values */ - public function toArray($keyType = BasePeer::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + public function toArray($keyType = BasePeer::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array()) { if (isset($alreadyDumpedObjects['CcTracktypes'][$this->getPrimaryKey()])) { return '*RECURSION*'; @@ -763,6 +781,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $result[$key] = $virtualColumn; } + return $result; } @@ -836,9 +855,9 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setDbCode($arr[$keys[1]]); - if (array_key_exists($keys[3], $arr)) $this->setDbVisibility($arr[$keys[2]]); - if (array_key_exists($keys[4], $arr)) $this->setDbTypeName($arr[$keys[3]]); - if (array_key_exists($keys[5], $arr)) $this->setDbDescription($arr[$keys[4]]); + if (array_key_exists($keys[2], $arr)) $this->setDbVisibility($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDbTypeName($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setDbDescription($arr[$keys[4]]); } /** @@ -922,18 +941,6 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent $copyObj->setDbVisibility($this->getDbVisibility()); $copyObj->setDbTypeName($this->getDbTypeName()); $copyObj->setDbDescription($this->getDbDescription()); - - if ($deepCopy && !$this->startCopy) { - // important: temporarily setNew(false) because this affects the behavior of - // the getter/setter methods for fkey referrer objects. - $copyObj->setNew(false); - // store object hash to prevent cycle - $this->startCopy = true; - - //unflag object copy - $this->startCopy = false; - } // if ($deepCopy) - if ($makeNew) { $copyObj->setNew(true); $copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value @@ -987,7 +994,7 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent { $this->id = null; $this->code = null; - $this->visibility = false; + $this->visibility = null; $this->type_name = null; $this->description = null; $this->alreadyInSave = false; @@ -1011,6 +1018,11 @@ abstract class BaseCcTracktypes extends BaseObject implements Persistent */ public function clearAllReferences($deep = false) { + if ($deep && !$this->alreadyInClearAllReferencesDeep) { + $this->alreadyInClearAllReferencesDeep = true; + + $this->alreadyInClearAllReferencesDeep = false; + } // if ($deep) } diff --git a/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php b/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php index 8fc96a88a..3f560c7d0 100644 --- a/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php +++ b/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php @@ -1,5 +1,6 @@ - * $query->filterByDbVisibility('fooValue'); // WHERE visibility = 'fooValue' - * $query->filterByDbVisibility('%fooValue%'); // WHERE visibility LIKE '%fooValue%' + * $query->filterByDbVisibility(true); // WHERE visibility = true + * $query->filterByDbVisibility('yes'); // WHERE visibility = true * * - * @param string $dbVisibility The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) + * @param boolean|string $dbVisibility The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcTracktypesQuery The current query, for fluid interface */ public function filterByDbVisibility($dbVisibility = null, $comparison = null) { - if (null === $comparison) { - if (is_array($dbVisibility)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $dbVisibility)) { - $dbVisibility = str_replace('*', '%', $dbVisibility); - $comparison = Criteria::LIKE; - } + if (is_string($dbVisibility)) { + $dbVisibility = in_array(strtolower($dbVisibility), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; } return $this->addUsingAlias(CcTracktypesPeer::VISIBILITY, $dbVisibility, $comparison); } /** - * Filter the query on the first_name column + * Filter the query on the type_name column * * Example usage: * @@ -339,53 +338,53 @@ abstract class BaseCcTracktypesQuery extends ModelCriteria * $query->filterByDbTypeName('%fooValue%'); // WHERE type_name LIKE '%fooValue%' * * - * @param string $dbFirstName The value to use as filter. + * @param string $dbTypeName The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcTracktypesQuery The current query, for fluid interface */ - public function filterByDbFirstName($dbFirstName = null, $comparison = null) + public function filterByDbTypeName($dbTypeName = null, $comparison = null) { if (null === $comparison) { - if (is_array($dbFirstName)) { + if (is_array($dbTypeName)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $dbFirstName)) { - $dbFirstName = str_replace('*', '%', $dbFirstName); + } elseif (preg_match('/[\%\*]/', $dbTypeName)) { + $dbTypeName = str_replace('*', '%', $dbTypeName); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CcTracktypesPeer::FIRST_NAME, $dbFirstName, $comparison); + return $this->addUsingAlias(CcTracktypesPeer::TYPE_NAME, $dbTypeName, $comparison); } /** - * Filter the query on the last_name column + * Filter the query on the description column * * Example usage: * - * $query->filterByDbLastName('fooValue'); // WHERE last_name = 'fooValue' - * $query->filterByDbLastName('%fooValue%'); // WHERE last_name LIKE '%fooValue%' + * $query->filterByDbDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDbDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' * * - * @param string $dbLastName The value to use as filter. + * @param string $dbDescription The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcTracktypesQuery The current query, for fluid interface */ - public function filterByDbLastName($dbLastName = null, $comparison = null) + public function filterByDbDescription($dbDescription = null, $comparison = null) { if (null === $comparison) { - if (is_array($dbLastName)) { + if (is_array($dbDescription)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $dbLastName)) { - $dbLastName = str_replace('*', '%', $dbLastName); + } elseif (preg_match('/[\%\*]/', $dbDescription)) { + $dbDescription = str_replace('*', '%', $dbDescription); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CcTracktypesPeer::LAST_NAME, $dbLastName, $comparison); + return $this->addUsingAlias(CcTracktypesPeer::DESCRIPTION, $dbDescription, $comparison); } /** diff --git a/legacy/application/models/airtime/om/BaseCcWebstream.php b/legacy/application/models/airtime/om/BaseCcWebstream.php index fedddbcbd..6e18b4d0f 100644 --- a/legacy/application/models/airtime/om/BaseCcWebstream.php +++ b/legacy/application/models/airtime/om/BaseCcWebstream.php @@ -354,7 +354,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -375,7 +375,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -396,7 +396,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent */ public function setDbUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -417,7 +417,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent */ public function setDbLength($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -528,7 +528,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent */ public function setDbMime($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCcWebstreamMetadata.php b/legacy/application/models/airtime/om/BaseCcWebstreamMetadata.php index 2976c85c4..34a8a5fdf 100644 --- a/legacy/application/models/airtime/om/BaseCcWebstreamMetadata.php +++ b/legacy/application/models/airtime/om/BaseCcWebstreamMetadata.php @@ -223,7 +223,7 @@ abstract class BaseCcWebstreamMetadata extends BaseObject implements Persistent */ public function setDbLiquidsoapData($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCeleryTasks.php b/legacy/application/models/airtime/om/BaseCeleryTasks.php index 70879be46..e6b4b13ce 100644 --- a/legacy/application/models/airtime/om/BaseCeleryTasks.php +++ b/legacy/application/models/airtime/om/BaseCeleryTasks.php @@ -209,7 +209,7 @@ abstract class BaseCeleryTasks extends BaseObject implements Persistent */ public function setDbTaskId($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -255,7 +255,7 @@ abstract class BaseCeleryTasks extends BaseObject implements Persistent */ public function setDbName($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -299,7 +299,7 @@ abstract class BaseCeleryTasks extends BaseObject implements Persistent */ public function setDbStatus($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseCloudFile.php b/legacy/application/models/airtime/om/BaseCloudFile.php index 988fadeb9..07f85730e 100644 --- a/legacy/application/models/airtime/om/BaseCloudFile.php +++ b/legacy/application/models/airtime/om/BaseCloudFile.php @@ -151,7 +151,7 @@ abstract class BaseCloudFile extends BaseObject implements Persistent */ public function setStorageBackend($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -172,7 +172,7 @@ abstract class BaseCloudFile extends BaseObject implements Persistent */ public function setResourceId($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BasePodcast.php b/legacy/application/models/airtime/om/BasePodcast.php index 8a866b717..5f9c241e2 100644 --- a/legacy/application/models/airtime/om/BasePodcast.php +++ b/legacy/application/models/airtime/om/BasePodcast.php @@ -374,7 +374,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -395,7 +395,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbTitle($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -416,7 +416,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbCreator($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -437,7 +437,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -458,7 +458,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbLanguage($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -479,7 +479,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbCopyright($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -500,7 +500,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbLink($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -521,7 +521,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbItunesAuthor($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -542,7 +542,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbItunesKeywords($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -563,7 +563,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbItunesSummary($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -584,7 +584,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbItunesSubtitle($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -605,7 +605,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbItunesCategory($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -626,7 +626,7 @@ abstract class BasePodcast extends BaseObject implements Persistent */ public function setDbItunesExplicit($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BasePodcastEpisodes.php b/legacy/application/models/airtime/om/BasePodcastEpisodes.php index 23e331847..dfa1f1e72 100644 --- a/legacy/application/models/airtime/om/BasePodcastEpisodes.php +++ b/legacy/application/models/airtime/om/BasePodcastEpisodes.php @@ -321,7 +321,7 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent */ public function setDbDownloadUrl($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -342,7 +342,7 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent */ public function setDbEpisodeGuid($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -363,7 +363,7 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent */ public function setDbEpisodeTitle($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -384,7 +384,7 @@ abstract class BasePodcastEpisodes extends BaseObject implements Persistent */ public function setDbEpisodeDescription($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/airtime/om/BaseThirdPartyTrackReferences.php b/legacy/application/models/airtime/om/BaseThirdPartyTrackReferences.php index 662e287cb..5b7a37bbc 100644 --- a/legacy/application/models/airtime/om/BaseThirdPartyTrackReferences.php +++ b/legacy/application/models/airtime/om/BaseThirdPartyTrackReferences.php @@ -243,7 +243,7 @@ abstract class BaseThirdPartyTrackReferences extends BaseObject implements Persi */ public function setDbService($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -264,7 +264,7 @@ abstract class BaseThirdPartyTrackReferences extends BaseObject implements Persi */ public function setDbForeignId($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } @@ -333,7 +333,7 @@ abstract class BaseThirdPartyTrackReferences extends BaseObject implements Persi */ public function setDbStatus($v) { - if ($v !== null && is_numeric($v)) { + if ($v !== null) { $v = (string) $v; } diff --git a/legacy/application/models/formatters/LengthFormatter.php b/legacy/application/models/formatters/LengthFormatter.php index eb065ee48..be0a40c10 100644 --- a/legacy/application/models/formatters/LengthFormatter.php +++ b/legacy/application/models/formatters/LengthFormatter.php @@ -23,7 +23,7 @@ class LengthFormatter $seconds = round($pieces[2], 1); $seconds = number_format($seconds, 1); - list($seconds, $milliStr) = explode('.', $seconds); + [$seconds, $milliStr] = explode('.', $seconds); if (intval($pieces[0]) !== 0) { $hours = ltrim($pieces[0], '0'); diff --git a/legacy/application/services/CalendarService.php b/legacy/application/services/CalendarService.php index 5fcf1e6e2..eae89f3f9 100644 --- a/legacy/application/services/CalendarService.php +++ b/legacy/application/services/CalendarService.php @@ -353,7 +353,7 @@ class Application_Service_CalendarService $con->beginTransaction(); //new starts,ends are in UTC - list($newStartsDateTime, $newEndsDateTime) = $this->validateShowMove( + [$newStartsDateTime, $newEndsDateTime] = $this->validateShowMove( $deltaDay, $deltaMin ); diff --git a/legacy/application/services/HistoryService.php b/legacy/application/services/HistoryService.php index 91cedf4e3..869870499 100644 --- a/legacy/application/services/HistoryService.php +++ b/legacy/application/services/HistoryService.php @@ -122,7 +122,7 @@ class Application_Service_HistoryService ' FROM cc_files AS file' . ') AS file_md'; - $fileMd = str_replace('%NON_NULL_FILE_SELECT%', join(', ', $nonNullFileSelect), $fileMd); + $fileMd = str_replace('%NON_NULL_FILE_SELECT%', implode(', ', $nonNullFileSelect), $fileMd); //null files are from manually added data (filling in webstream info etc) $nullFile = '(' . @@ -135,11 +135,11 @@ class Application_Service_HistoryService //building the file inner query $fileSqlQuery = - 'SELECT ' . join(', ', $fileSelect) . + 'SELECT ' . implode(', ', $fileSelect) . " FROM {$historyFile}" . " LEFT JOIN {$fileMd} USING (file_id)" . ' UNION' . - ' SELECT ' . join(', ', $nullFileSelect) . + ' SELECT ' . implode(', ', $nullFileSelect) . " FROM {$nullFile}"; foreach ($fileMdFilters as $filter) { @@ -159,7 +159,7 @@ class Application_Service_HistoryService } $mainSqlQuery .= - 'SELECT ' . join(', ', $mainSelect) . + 'SELECT ' . implode(', ', $mainSelect) . " FROM {$historyRange}"; if (isset($fileSqlQuery)) { @@ -214,7 +214,7 @@ class Application_Service_HistoryService } if (count($orderBys) > 0) { - $orders = join(', ', $orderBys); + $orders = implode(', ', $orderBys); $mainSqlQuery .= " ORDER BY {$orders}"; @@ -340,7 +340,7 @@ class Application_Service_HistoryService LEFT JOIN cc_files AS file ON (file.id = playout.file_id)) AS summary'; $mainSqlQuery .= - 'SELECT ' . join(', ', $select) . + 'SELECT ' . implode(', ', $select) . " FROM {$fileSummaryTable}"; //------------------------------------------------------------------------- @@ -373,7 +373,7 @@ class Application_Service_HistoryService } if ($numOrderColumns > 0) { - $orders = join(', ', $orderBys); + $orders = implode(', ', $orderBys); $mainSqlQuery .= " ORDER BY {$orders}"; diff --git a/legacy/application/services/MediaService.php b/legacy/application/services/MediaService.php index de5041a5d..b105e9c91 100644 --- a/legacy/application/services/MediaService.php +++ b/legacy/application/services/MediaService.php @@ -111,12 +111,12 @@ class Application_Service_MediaService break; //Break out of the loop if we successfully read the file! } catch (LibreTimeFileNotFoundException $e) { //If we have no alternate filepaths left, then let the exception bubble up. - if (sizeof($filePaths) == 0) { + if (count($filePaths) == 0) { throw $e; } } //Retry with the next alternate filepath in the list - } while (sizeof($filePaths) > 0); + } while (count($filePaths) > 0); exit; } diff --git a/legacy/application/services/PodcastEpisodeService.php b/legacy/application/services/PodcastEpisodeService.php index 73263a509..515c0e350 100644 --- a/legacy/application/services/PodcastEpisodeService.php +++ b/legacy/application/services/PodcastEpisodeService.php @@ -456,7 +456,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir Logging::info($testenclosures); // we need to check if this is an array otherwise sizeof will fail and stop this whole script if (is_array($testenclosures)) { - $numenclosures = sizeof($testenclosures); + $numenclosures = count($testenclosures); // now we loop through and look for a audio file and then stop the loop at the first one we find for ($i = 0; $i < $numenclosures + 1; ++$i) { $enclosure_attribs = array_values($testenclosures[$i]['attribs'])[0]; diff --git a/legacy/application/services/PodcastService.php b/legacy/application/services/PodcastService.php index e6d057180..55d2591d5 100644 --- a/legacy/application/services/PodcastService.php +++ b/legacy/application/services/PodcastService.php @@ -82,7 +82,7 @@ class Application_Service_PodcastService array_push($categories, $category->get_scheme() . ':' . $category->get_term()); } } - $podcastArray['category'] = htmlspecialchars(implode($categories)); + $podcastArray['category'] = htmlspecialchars(implode('', $categories)); //TODO: put in constants $itunesChannel = 'http://www.itunes.com/dtds/podcast-1.0.dtd'; diff --git a/legacy/application/services/SchedulerService.php b/legacy/application/services/SchedulerService.php index 9d9625dd7..33819beb4 100644 --- a/legacy/application/services/SchedulerService.php +++ b/legacy/application/services/SchedulerService.php @@ -298,7 +298,7 @@ class Application_Service_SchedulerService $insert_sql = 'INSERT INTO cc_schedule (starts, ends, ' . 'clip_length, fade_in, fade_out, cue_in, cue_out, ' . 'file_id, stream_id, instance_id, position) VALUES ' . - implode($values, ','); + implode(',', $values); Application_Common_Database::prepareAndExecute( $insert_sql, [], diff --git a/legacy/application/services/ShowService.php b/legacy/application/services/ShowService.php index 3d718a612..a6305ad53 100644 --- a/legacy/application/services/ShowService.php +++ b/legacy/application/services/ShowService.php @@ -1138,7 +1138,7 @@ SQL; $time = explode(':', $rebroadcast['start_time']); $offset = ['days' => $days[0], 'hours' => $time[0], 'mins' => $time[1]]; - list($utcStartDateTime, $utcEndDateTime) = $this->createUTCStartEndDateTime( + [$utcStartDateTime, $utcEndDateTime] = $this->createUTCStartEndDateTime( $showStartDate, $showDay->getDbDuration(), $offset @@ -1168,7 +1168,7 @@ SQL; //DateTime object $start = $showDay->getLocalStartDateAndTime(); - list($utcStartDateTime, $utcEndDateTime) = $this->createUTCStartEndDateTime( + [$utcStartDateTime, $utcEndDateTime] = $this->createUTCStartEndDateTime( $start, $showDay->getDbDuration() ); @@ -1253,7 +1253,7 @@ SQL; $previousDate = clone $start; foreach ($datePeriod as $date) { - list($utcStartDateTime, $utcEndDateTime) = $this->createUTCStartEndDateTime( + [$utcStartDateTime, $utcEndDateTime] = $this->createUTCStartEndDateTime( $date, $duration ); @@ -1338,7 +1338,7 @@ SQL; } // We will only need this if the repeat type is MONTHLY_WEEKLY - list($weekNumberOfMonth, $dayOfWeek) = + [$weekNumberOfMonth, $dayOfWeek] = self::getMonthlyWeeklyRepeatInterval( new DateTime($first_show, new DateTimeZone($timezone)) ); @@ -1353,7 +1353,7 @@ SQL; } while ($start->getTimestamp() < $end->getTimestamp()) { - list($utcStartDateTime, $utcEndDateTime) = $this->createUTCStartEndDateTime( + [$utcStartDateTime, $utcEndDateTime] = $this->createUTCStartEndDateTime( $start, $duration ); @@ -1932,7 +1932,7 @@ SQL; $endDateTime = clone $startDateTime; $duration = explode(':', $duration); - list($hours, $mins) = array_slice($duration, 0, 2); + [$hours, $mins] = array_slice($duration, 0, 2); $endDateTime->add(new DateInterval("PT{$hours}H{$mins}M")); $startDateTime->setTimezone(new DateTimeZone('UTC')); diff --git a/legacy/composer.json b/legacy/composer.json index 8e4688be3..19280ca30 100644 --- a/legacy/composer.json +++ b/legacy/composer.json @@ -10,41 +10,45 @@ "vendor/phpunit/dbunit/src/" ] }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/jooola/propel1" + } + ], "require": { - "james-heinrich/getid3": "dev-master", - "propel/propel1": "1.7.0-stable", - "aws/aws-sdk-php": "2.7.9", - "raven/raven": "0.12.0", + "composer/semver": "^3.2", + "james-heinrich/getid3": "^1.9", + "jooola/propel1": "dev-master", "massivescale/celery-php": "^2.1", - "simplepie/simplepie": "1.5.6", - "zf1s/zend-application": "^1.13", - "composer/semver": "^3.1", - "php-amqplib/php-amqplib": "^2.6", + "php-amqplib/php-amqplib": "^2.12", + "simplepie/simplepie": "^1.5", "zf1s/zend-acl": "^1.13", - "zf1s/zend-session": "^1.13", - "zf1s/zend-navigation": "^1.13", + "zf1s/zend-application": "^1.13", + "zf1s/zend-auth": "^1.13", + "zf1s/zend-cache": "^1.13", "zf1s/zend-controller": "^1.13", - "zf1s/zend-log": "^1.13", - "zf1s/zend-version": "^1.13", - "zf1s/zend-rest": "^1.13", + "zf1s/zend-date": "^1.13", + "zf1s/zend-db": "^1.13", + "zf1s/zend-file-transfer": "^1.13", + "zf1s/zend-file": "^1.13", + "zf1s/zend-filter": "^1.13", + "zf1s/zend-form": "^1.13", + "zf1s/zend-http": "^1.13", + "zf1s/zend-json": "^1.13", "zf1s/zend-layout": "^1.13", "zf1s/zend-loader": "^1.13", - "zf1s/zend-auth": "^1.13", - "zf1s/zend-filter": "^1.13", - "zf1s/zend-json": "^1.13", - "zf1s/zend-form": "^1.13", - "zf1s/zend-db": "^1.13", - "zf1s/zend-file": "^1.13", - "zf1s/zend-file-transfer": "^1.13", - "zf1s/zend-http": "^1.13", - "zf1s/zend-date": "^1.13", - "zf1s/zend-view": "^1.13", + "zf1s/zend-log": "^1.13", + "zf1s/zend-navigation": "^1.13", + "zf1s/zend-rest": "^1.13", + "zf1s/zend-session": "^1.13", "zf1s/zend-validate": "^1.13", - "zf1s/zend-cache": "^1.13" + "zf1s/zend-version": "^1.13", + "zf1s/zend-view": "^1.13" }, "require-dev": { - "phpunit/phpunit": "^4.3", "phpunit/dbunit": "^2.0", + "phpunit/phpunit": "^4.3", "zf1s/zend-test": "^1.13" } } diff --git a/legacy/composer.lock b/legacy/composer.lock index 00e7877a9..113d13d67 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -4,80 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2e1981c5cb80066d1ca948d8d58ea962", + "content-hash": "a3865b7427df3626b2d81294b93dd7e6", "packages": [ - { - "name": "aws/aws-sdk-php", - "version": "2.7.9", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "f39354df58eec97f0ef22ccf3caf753607a47dca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f39354df58eec97f0ef22ccf3caf753607a47dca", - "reference": "f39354df58eec97f0ef22ccf3caf753607a47dca", - "shasum": "" - }, - "require": { - "guzzle/guzzle": "~3.7", - "php": ">=5.3.3" - }, - "require-dev": { - "doctrine/cache": "~1.0", - "ext-openssl": "*", - "monolog/monolog": "~1.4", - "phpunit/phpunit": "~4.0", - "symfony/yaml": "~2.1" - }, - "suggest": { - "doctrine/cache": "Adds support for caching of credentials and responses", - "ext-apc": "Allows service description opcode caching, request and response caching, and credentials caching", - "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", - "monolog/monolog": "Adds support for logging HTTP requests and responses", - "symfony/yaml": "Eases the ability to write manifests for creating jobs in AWS Import/Export" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "autoload": { - "psr-0": { - "Aws": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "cloud", - "dynamodb", - "ec2", - "glacier", - "s3", - "sdk" - ], - "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", - "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/master" - }, - "time": "2014-12-08T21:56:46+00:00" - }, { "name": "composer/semver", "version": "3.2.5", @@ -159,118 +87,18 @@ ], "time": "2021-05-24T12:41:47+00:00" }, - { - "name": "guzzle/guzzle", - "version": "v3.9.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "support": { - "issues": "https://github.com/guzzle/guzzle3/issues", - "source": "https://github.com/guzzle/guzzle3/tree/master" - }, - "abandoned": "guzzlehttp/guzzle", - "time": "2015-03-18T18:23:50+00:00" - }, { "name": "james-heinrich/getid3", - "version": "dev-master", + "version": "v1.9.21", "source": { "type": "git", "url": "https://github.com/JamesHeinrich/getID3.git", - "reference": "9418214d70830919f18e82bf1dc914e09740f9f8" + "reference": "36f5dabb1325415a4b07a401113f8db2eb81eca1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/9418214d70830919f18e82bf1dc914e09740f9f8", - "reference": "9418214d70830919f18e82bf1dc914e09740f9f8", + "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/36f5dabb1325415a4b07a401113f8db2eb81eca1", + "reference": "36f5dabb1325415a4b07a401113f8db2eb81eca1", "shasum": "" }, "require": { @@ -296,7 +124,6 @@ "ext-xml": "XML extension is required for graphic modules to analyze the XML metadata.", "ext-zlib": "Zlib extension is required for archive modules and compressed metadata." }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -323,9 +150,76 @@ ], "support": { "issues": "https://github.com/JamesHeinrich/getID3/issues", - "source": "https://github.com/JamesHeinrich/getID3/tree/master" + "source": "https://github.com/JamesHeinrich/getID3/tree/v1.9.21" }, - "time": "2021-09-17T17:01:13+00:00" + "time": "2021-09-22T16:34:51+00:00" + }, + { + "name": "jooola/propel1", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/jooola/propel1.git", + "reference": "419193e7f7fe3b7123cd4fc475264adef7005831" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jooola/propel1/zipball/419193e7f7fe3b7123cd4fc475264adef7005831", + "reference": "419193e7f7fe3b7123cd4fc475264adef7005831", + "shasum": "" + }, + "require": { + "phing/phing": "~2.4", + "php": ">=5.2.4" + }, + "require-dev": { + "pear-pear.php.net/pear_packagefilemanager2": "@stable", + "phpunit/phpunit": "~4.0||~5.0" + }, + "default-branch": true, + "bin": [ + "generator/bin/propel-gen", + "generator/bin/propel-gen.bat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "classmap": [ + "runtime/lib", + "generator/lib" + ] + }, + "include-path": [ + "runtime/lib", + "generator/lib" + ], + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "william.durand1@gmail.com", + "homepage": "http://www.willdurand.fr" + } + ], + "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.", + "homepage": "http://www.propelorm.org/", + "keywords": [ + "active record", + "database", + "mapping", + "orm", + "persistence" + ], + "support": { + "source": "https://github.com/jooola/propel1/tree/master" + }, + "time": "2021-10-03T22:21:13+00:00" }, { "name": "massivescale/celery-php", @@ -807,132 +701,6 @@ ], "time": "2021-08-16T04:24:45+00:00" }, - { - "name": "propel/propel1", - "version": "1.7.0", - "source": { - "type": "git", - "url": "https://github.com/propelorm/Propel.git", - "reference": "09058f1443bc287e550b9342a4379aac2e0a0b8f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel/zipball/09058f1443bc287e550b9342a4379aac2e0a0b8f", - "reference": "09058f1443bc287e550b9342a4379aac2e0a0b8f", - "shasum": "" - }, - "require": { - "phing/phing": "~2.4", - "php": ">=5.2.4" - }, - "require-dev": { - "pear-pear.php.net/pear_packagefilemanager2": "@stable" - }, - "bin": [ - "generator/bin/propel-gen", - "generator/bin/propel-gen.bat" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "classmap": [ - "runtime/lib", - "generator/lib" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "runtime/lib", - "generator/lib" - ], - "license": [ - "MIT" - ], - "authors": [ - { - "name": "William Durand", - "email": "william.durand1@gmail.com", - "homepage": "http://www.willdurand.fr" - } - ], - "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.", - "homepage": "http://www.propelorm.org/", - "keywords": [ - "Active Record", - "database", - "mapping", - "orm", - "persistence" - ], - "support": { - "issues": "https://github.com/propelorm/Propel/issues", - "source": "https://github.com/propelorm/Propel/tree/1.7.0" - }, - "time": "2013-10-21T12:52:56+00:00" - }, - { - "name": "raven/raven", - "version": "0.12.0", - "source": { - "type": "git", - "url": "https://github.com/getsentry/raven-php.git", - "reference": "bd247ca2a8fd9ccfb99b60285c9b31286384a92b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/getsentry/raven-php/zipball/bd247ca2a8fd9ccfb99b60285c9b31286384a92b", - "reference": "bd247ca2a8fd9ccfb99b60285c9b31286384a92b", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.2.4" - }, - "require-dev": { - "fabpot/php-cs-fixer": "^1.8.0", - "phpunit/phpunit": "^4.6.6" - }, - "bin": [ - "bin/raven" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.12.x-dev" - } - }, - "autoload": { - "psr-0": { - "Raven_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "David Cramer", - "email": "dcramer@gmail.com" - } - ], - "description": "A PHP client for Sentry (http://getsentry.com)", - "homepage": "http://getsentry.com", - "keywords": [ - "log", - "logging" - ], - "support": { - "issues": "https://github.com/getsentry/raven-php/issues", - "source": "https://github.com/getsentry/raven-php/tree/master" - }, - "abandoned": "sentry/sentry", - "time": "2015-05-19T20:20:08+00:00" - }, { "name": "simplepie/simplepie", "version": "1.5.6", @@ -1004,86 +772,23 @@ }, "time": "2020-10-14T07:17:22+00:00" }, - { - "name": "symfony/event-dispatcher", - "version": "v2.8.52", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a77e974a5fecb4398833b0709210e3d5e334ffb0", - "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v2.8.50" - }, - "time": "2018-11-21T14:20:20+00:00" - }, { "name": "zf1s/zend-acl", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-acl.git", - "reference": "3646720b16971c27800072af01b4392aaf467755" + "reference": "fb83cd9cdaf68131fa2c50bd0188a09a43ae58d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-acl/zipball/3646720b16971c27800072af01b4392aaf467755", - "reference": "3646720b16971c27800072af01b4392aaf467755", + "url": "https://api.github.com/repos/zf1s/zend-acl/zipball/fb83cd9cdaf68131fa2c50bd0188a09a43ae58d2", + "reference": "fb83cd9cdaf68131fa2c50bd0188a09a43ae58d2", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-acl": "^1.12" @@ -1112,28 +817,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-acl/tree/1.13.4" + "source": "https://github.com/zf1s/zend-acl/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-application", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-application.git", - "reference": "83bbf3f19248f888374c946fd85572c86d595b16" + "reference": "b6ac9b3b6cf5bc213a19b5004cba1f28df8218f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-application/zipball/83bbf3f19248f888374c946fd85572c86d595b16", - "reference": "83bbf3f19248f888374c946fd85572c86d595b16", + "url": "https://api.github.com/repos/zf1s/zend-application/zipball/b6ac9b3b6cf5bc213a19b5004cba1f28df8218f1", + "reference": "b6ac9b3b6cf5bc213a19b5004cba1f28df8218f1", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-controller": "^1.13.4", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-controller": "^1.14.0", + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-application": "^1.12" @@ -1167,28 +872,28 @@ ], "support": { "issues": "https://github.com/zf1s/zend-application/issues", - "source": "https://github.com/zf1s/zend-application/tree/1.13.4" + "source": "https://github.com/zf1s/zend-application/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-auth", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-auth.git", - "reference": "406aed396cd362a27e2417306dc34693ddb0dfe0" + "reference": "66547b97e24f72206e57fbf5396b0423bc89579e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-auth/zipball/406aed396cd362a27e2417306dc34693ddb0dfe0", - "reference": "406aed396cd362a27e2417306dc34693ddb0dfe0", + "url": "https://api.github.com/repos/zf1s/zend-auth/zipball/66547b97e24f72206e57fbf5396b0423bc89579e", + "reference": "66547b97e24f72206e57fbf5396b0423bc89579e", "shasum": "" }, "require": { "ext-ctype": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-auth": "^1.12" @@ -1224,27 +929,27 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-auth/tree/1.13.4" + "source": "https://github.com/zf1s/zend-auth/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-cache", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-cache.git", - "reference": "aa9a5a8ce06f581656cd597ce19059a4d820db72" + "reference": "be856081355b349c1624a2fbce2018121885fa75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-cache/zipball/aa9a5a8ce06f581656cd597ce19059a4d820db72", - "reference": "aa9a5a8ce06f581656cd597ce19059a4d820db72", + "url": "https://api.github.com/repos/zf1s/zend-cache/zipball/be856081355b349c1624a2fbce2018121885fa75", + "reference": "be856081355b349c1624a2fbce2018121885fa75", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-cache": "^1.12" @@ -1281,28 +986,28 @@ ], "support": { "issues": "https://github.com/zf1s/zend-cache/issues", - "source": "https://github.com/zf1s/zend-cache/tree/1.13.4" + "source": "https://github.com/zf1s/zend-cache/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-config", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-config.git", - "reference": "2cd4c0addd4111ef819357759be7108ac641914f" + "reference": "50c86560105aff37a4b3b2f7ce706c269baff0b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-config/zipball/2cd4c0addd4111ef819357759be7108ac641914f", - "reference": "2cd4c0addd4111ef819357759be7108ac641914f", + "url": "https://api.github.com/repos/zf1s/zend-config/zipball/50c86560105aff37a4b3b2f7ce706c269baff0b4", + "reference": "50c86560105aff37a4b3b2f7ce706c269baff0b4", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-xml": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-xml": "^1.14.0" }, "replace": { "zf1/zend-config": "^1.12" @@ -1334,35 +1039,35 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-config/tree/1.13.4" + "source": "https://github.com/zf1s/zend-config/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-controller", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-controller.git", - "reference": "170ec3b6904ad0a1b196dbe8bcfc18126163f43f" + "reference": "2b75a35afb6cd4fbca2670e74cd23b65ed2e66a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-controller/zipball/170ec3b6904ad0a1b196dbe8bcfc18126163f43f", - "reference": "170ec3b6904ad0a1b196dbe8bcfc18126163f43f", + "url": "https://api.github.com/repos/zf1s/zend-controller/zipball/2b75a35afb6cd4fbca2670e74cd23b65ed2e66a0", + "reference": "2b75a35afb6cd4fbca2670e74cd23b65ed2e66a0", "shasum": "" }, "require": { "ext-reflection": "*", "ext-session": "*", "php": ">=5.3.3", - "zf1s/zend-config": "^1.13.4", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-registry": "^1.13.4", - "zf1s/zend-uri": "^1.13.4", - "zf1s/zend-view": "^1.13.4", - "zf1s/zend-xml": "^1.13.4" + "zf1s/zend-config": "^1.14.0", + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-registry": "^1.14.0", + "zf1s/zend-uri": "^1.14.0", + "zf1s/zend-view": "^1.14.0", + "zf1s/zend-xml": "^1.14.0" }, "replace": { "zf1/zend-controller": "^1.12" @@ -1397,27 +1102,27 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-controller/tree/1.13.4" + "source": "https://github.com/zf1s/zend-controller/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-crypt", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-crypt.git", - "reference": "3113c7ff9a25201faa10538cd3c4aced38d1d633" + "reference": "ee8e76ff35b333322e554ca640af5910782c1d0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-crypt/zipball/3113c7ff9a25201faa10538cd3c4aced38d1d633", - "reference": "3113c7ff9a25201faa10538cd3c4aced38d1d633", + "url": "https://api.github.com/repos/zf1s/zend-crypt/zipball/ee8e76ff35b333322e554ca640af5910782c1d0e", + "reference": "ee8e76ff35b333322e554ca640af5910782c1d0e", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-crypt": "^1.12" @@ -1446,28 +1151,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-crypt/tree/1.13.4" + "source": "https://github.com/zf1s/zend-crypt/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-date", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-date.git", - "reference": "363dc847b54d0c7c8c7006f2d7f4b4d5e0a63ee2" + "reference": "422fd722e92853102d5c42ba0dd814de7a48a495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-date/zipball/363dc847b54d0c7c8c7006f2d7f4b4d5e0a63ee2", - "reference": "363dc847b54d0c7c8c7006f2d7f4b4d5e0a63ee2", + "url": "https://api.github.com/repos/zf1s/zend-date/zipball/422fd722e92853102d5c42ba0dd814de7a48a495", + "reference": "422fd722e92853102d5c42ba0dd814de7a48a495", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-locale": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-locale": "^1.14.0" }, "replace": { "zf1/zend-date": "^1.12" @@ -1496,28 +1201,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-date/tree/1.13.4" + "source": "https://github.com/zf1s/zend-date/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-db", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-db.git", - "reference": "898dcf333abeefff7af2a7bfa3adb7ad8280b55a" + "reference": "92e5d7b02efac31e85504dc9819257b4bed00d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-db/zipball/898dcf333abeefff7af2a7bfa3adb7ad8280b55a", - "reference": "898dcf333abeefff7af2a7bfa3adb7ad8280b55a", + "url": "https://api.github.com/repos/zf1s/zend-db/zipball/92e5d7b02efac31e85504dc9819257b4bed00d90", + "reference": "92e5d7b02efac31e85504dc9819257b4bed00d90", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0" }, "replace": { "zf1/zend-db": "^1.12" @@ -1554,22 +1259,22 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-db/tree/1.13.4" + "source": "https://github.com/zf1s/zend-db/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-exception", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-exception.git", - "reference": "a6e983bd4de5a9c8e70a96ceac0d016e0af41e15" + "reference": "fbd0dc32013cd9d05c5172d65b78dafef63f0c81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-exception/zipball/a6e983bd4de5a9c8e70a96ceac0d016e0af41e15", - "reference": "a6e983bd4de5a9c8e70a96ceac0d016e0af41e15", + "url": "https://api.github.com/repos/zf1s/zend-exception/zipball/fbd0dc32013cd9d05c5172d65b78dafef63f0c81", + "reference": "fbd0dc32013cd9d05c5172d65b78dafef63f0c81", "shasum": "" }, "require": { @@ -1602,22 +1307,22 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-exception/tree/1.13.4" + "source": "https://github.com/zf1s/zend-exception/tree/1.14.0" }, - "time": "2019-12-16T11:48:38+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-file", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-file.git", - "reference": "c6b2f39e407d686180e4590e2b7dcb507e02597a" + "reference": "b60f271a7b2f4e6807e96a367ea2d4ddbc759cd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-file/zipball/c6b2f39e407d686180e4590e2b7dcb507e02597a", - "reference": "c6b2f39e407d686180e4590e2b7dcb507e02597a", + "url": "https://api.github.com/repos/zf1s/zend-file/zipball/b60f271a7b2f4e6807e96a367ea2d4ddbc759cd0", + "reference": "b60f271a7b2f4e6807e96a367ea2d4ddbc759cd0", "shasum": "" }, "require": { @@ -1653,27 +1358,27 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-file/tree/1.13.3" + "source": "https://github.com/zf1s/zend-file/tree/1.14.0" }, - "time": "2019-12-16T11:48:38+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-file-transfer", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-file-transfer.git", - "reference": "c26778b1d53bd1e181c26300f8f89d704840b2a4" + "reference": "608a8c1af954b7f7e18125953de5d438477111bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-file-transfer/zipball/c26778b1d53bd1e181c26300f8f89d704840b2a4", - "reference": "c26778b1d53bd1e181c26300f8f89d704840b2a4", + "url": "https://api.github.com/repos/zf1s/zend-file-transfer/zipball/608a8c1af954b7f7e18125953de5d438477111bb", + "reference": "608a8c1af954b7f7e18125953de5d438477111bb", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-file-transfer": "^1.12" @@ -1707,31 +1412,31 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-file-transfer/tree/1.13.4" + "source": "https://github.com/zf1s/zend-file-transfer/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-filter", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-filter.git", - "reference": "4d9036d0f2d265d4c6c568618778b6d8fba5757c" + "reference": "6a0e61f03d8624dda92fac1b8498455b8d217b1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-filter/zipball/4d9036d0f2d265d4c6c568618778b6d8fba5757c", - "reference": "4d9036d0f2d265d4c6c568618778b6d8fba5757c", + "url": "https://api.github.com/repos/zf1s/zend-filter/zipball/6a0e61f03d8624dda92fac1b8498455b8d217b1a", + "reference": "6a0e61f03d8624dda92fac1b8498455b8d217b1a", "shasum": "" }, "require": { "ext-reflection": "*", "php": ">=5.3.3", - "zf1s/zend-crypt": "^1.13.4", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-validate": "^1.13.4" + "zf1s/zend-crypt": "^1.14.0", + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-validate": "^1.14.0" }, "replace": { "zf1/zend-filter": "^1.12" @@ -1764,29 +1469,29 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-filter/tree/1.13.4" + "source": "https://github.com/zf1s/zend-filter/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-form", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-form.git", - "reference": "76e9b587054ff0e051f88a888b1af1c77bd15609" + "reference": "05b73579c0a5823bbaa51f08636a412a6b964231" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-form/zipball/76e9b587054ff0e051f88a888b1af1c77bd15609", - "reference": "76e9b587054ff0e051f88a888b1af1c77bd15609", + "url": "https://api.github.com/repos/zf1s/zend-form/zipball/05b73579c0a5823bbaa51f08636a412a6b964231", + "reference": "05b73579c0a5823bbaa51f08636a412a6b964231", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-filter": "^1.13.4", - "zf1s/zend-validate": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-filter": "^1.14.0", + "zf1s/zend-validate": "^1.14.0" }, "replace": { "zf1/zend-form": "^1.12" @@ -1823,30 +1528,30 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-form/tree/1.13.4" + "source": "https://github.com/zf1s/zend-form/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-http", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-http.git", - "reference": "e15308bdb9f7389e816642989d36ca20090f7f9c" + "reference": "d4caf18099ab0d3947479ef96f79fe7a041cd415" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-http/zipball/e15308bdb9f7389e816642989d36ca20090f7f9c", - "reference": "e15308bdb9f7389e816642989d36ca20090f7f9c", + "url": "https://api.github.com/repos/zf1s/zend-http/zipball/d4caf18099ab0d3947479ef96f79fe7a041cd415", + "reference": "d4caf18099ab0d3947479ef96f79fe7a041cd415", "shasum": "" }, "require": { "ext-ctype": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-uri": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-uri": "^1.14.0" }, "replace": { "zf1/zend-http": "^1.12" @@ -1879,31 +1584,31 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-http/tree/1.13.4" + "source": "https://github.com/zf1s/zend-http/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-json", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-json.git", - "reference": "f1dcd7df504c694b0c16a12e088431ad373cc941" + "reference": "4e2b2931fd69b679c83be2596dc2b31549e4e87f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-json/zipball/f1dcd7df504c694b0c16a12e088431ad373cc941", - "reference": "f1dcd7df504c694b0c16a12e088431ad373cc941", + "url": "https://api.github.com/repos/zf1s/zend-json/zipball/4e2b2931fd69b679c83be2596dc2b31549e4e87f", + "reference": "4e2b2931fd69b679c83be2596dc2b31549e4e87f", "shasum": "" }, "require": { "ext-reflection": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-server": "^1.13.4", - "zf1s/zend-xml": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-server": "^1.14.0", + "zf1s/zend-xml": "^1.14.0" }, "replace": { "zf1/zend-json": "^1.12" @@ -1935,27 +1640,27 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-json/tree/1.13.4" + "source": "https://github.com/zf1s/zend-json/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-layout", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-layout.git", - "reference": "9b126826e7563c8ccbee839ecba32500d4a78ed9" + "reference": "8f6e9576dae22b33f4b3c54dd9d3f0b5a0760333" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-layout/zipball/9b126826e7563c8ccbee839ecba32500d4a78ed9", - "reference": "9b126826e7563c8ccbee839ecba32500d4a78ed9", + "url": "https://api.github.com/repos/zf1s/zend-layout/zipball/8f6e9576dae22b33f4b3c54dd9d3f0b5a0760333", + "reference": "8f6e9576dae22b33f4b3c54dd9d3f0b5a0760333", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-layout": "^1.12" @@ -1990,27 +1695,27 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-layout/tree/1.13.4" + "source": "https://github.com/zf1s/zend-layout/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-loader", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-loader.git", - "reference": "5a667a1e5a47e5f8720b1660cfd12f3e442227b2" + "reference": "14d65396f6bb8bb977bed50b7c8323e0252436d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-loader/zipball/5a667a1e5a47e5f8720b1660cfd12f3e442227b2", - "reference": "5a667a1e5a47e5f8720b1660cfd12f3e442227b2", + "url": "https://api.github.com/repos/zf1s/zend-loader/zipball/14d65396f6bb8bb977bed50b7c8323e0252436d5", + "reference": "14d65396f6bb8bb977bed50b7c8323e0252436d5", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-loader": "^1.12" @@ -2039,31 +1744,31 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-loader/tree/1.13.4" + "source": "https://github.com/zf1s/zend-loader/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-locale", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-locale.git", - "reference": "859075539c0f521b9c88b5cb3c845680b4d29eaf" + "reference": "94ccfa57748df91c40f8b075b4b334b0825abd20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-locale/zipball/859075539c0f521b9c88b5cb3c845680b4d29eaf", - "reference": "859075539c0f521b9c88b5cb3c845680b4d29eaf", + "url": "https://api.github.com/repos/zf1s/zend-locale/zipball/94ccfa57748df91c40f8b075b4b334b0825abd20", + "reference": "94ccfa57748df91c40f8b075b4b334b0825abd20", "shasum": "" }, "require": { "ext-iconv": "*", "php": ">=5.3.3", - "zf1s/zend-cache": "^1.13.4", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-registry": "^1.13.4", - "zf1s/zend-xml": "^1.13.4" + "zf1s/zend-cache": "^1.14.0", + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-registry": "^1.14.0", + "zf1s/zend-xml": "^1.14.0" }, "replace": { "zf1/zend-locale": "^1.12" @@ -2095,28 +1800,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-locale/tree/1.13.4" + "source": "https://github.com/zf1s/zend-locale/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-log", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-log.git", - "reference": "1ede85c1c67f6d6472c1aeb02337a954beaa64cc" + "reference": "fb9051c62d62af74b0c6f76b57d3319021827b59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-log/zipball/1ede85c1c67f6d6472c1aeb02337a954beaa64cc", - "reference": "1ede85c1c67f6d6472c1aeb02337a954beaa64cc", + "url": "https://api.github.com/repos/zf1s/zend-log/zipball/fb9051c62d62af74b0c6f76b57d3319021827b59", + "reference": "fb9051c62d62af74b0c6f76b57d3319021827b59", "shasum": "" }, "require": { "ext-reflection": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-log": "^1.12" @@ -2149,28 +1854,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-log/tree/1.13.4" + "source": "https://github.com/zf1s/zend-log/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-navigation", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-navigation.git", - "reference": "1d55c20858ee9d1e5b2e871619f56b39dacd09d4" + "reference": "156c7d2f33fe1d7e11799c9707b147ca21c14ec4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-navigation/zipball/1d55c20858ee9d1e5b2e871619f56b39dacd09d4", - "reference": "1d55c20858ee9d1e5b2e871619f56b39dacd09d4", + "url": "https://api.github.com/repos/zf1s/zend-navigation/zipball/156c7d2f33fe1d7e11799c9707b147ca21c14ec4", + "reference": "156c7d2f33fe1d7e11799c9707b147ca21c14ec4", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-controller": "^1.13.4", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-controller": "^1.14.0", + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-navigation": "^1.12" @@ -2204,27 +1909,27 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-navigation/tree/1.13.4" + "source": "https://github.com/zf1s/zend-navigation/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-registry", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-registry.git", - "reference": "25d8732d9e18f2ebe4fba177e7433e9bab949417" + "reference": "b3b5d3f51710b9b2262945622cedbf287fb2673d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-registry/zipball/25d8732d9e18f2ebe4fba177e7433e9bab949417", - "reference": "25d8732d9e18f2ebe4fba177e7433e9bab949417", + "url": "https://api.github.com/repos/zf1s/zend-registry/zipball/b3b5d3f51710b9b2262945622cedbf287fb2673d", + "reference": "b3b5d3f51710b9b2262945622cedbf287fb2673d", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-registry": "^1.12" @@ -2256,22 +1961,22 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-registry/tree/1.13.4" + "source": "https://github.com/zf1s/zend-registry/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-rest", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-rest.git", - "reference": "1364b8a125b0676faeebf44b4302d3eccb56ba80" + "reference": "2dd2355f67ffb8cced14e383da1b0e81ac5f4cfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-rest/zipball/1364b8a125b0676faeebf44b4302d3eccb56ba80", - "reference": "1364b8a125b0676faeebf44b4302d3eccb56ba80", + "url": "https://api.github.com/repos/zf1s/zend-rest/zipball/2dd2355f67ffb8cced14e383da1b0e81ac5f4cfe", + "reference": "2dd2355f67ffb8cced14e383da1b0e81ac5f4cfe", "shasum": "" }, "require": { @@ -2280,11 +1985,11 @@ "ext-reflection": "*", "ext-simplexml": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-server": "^1.13.4", - "zf1s/zend-service": "^1.13.4", - "zf1s/zend-uri": "^1.13.4", - "zf1s/zend-xml": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-server": "^1.14.0", + "zf1s/zend-service": "^1.14.0", + "zf1s/zend-uri": "^1.14.0", + "zf1s/zend-xml": "^1.14.0" }, "replace": { "zf1/zend-rest": "^1.12" @@ -2313,29 +2018,29 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-rest/tree/1.13.4" + "source": "https://github.com/zf1s/zend-rest/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-server", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-server.git", - "reference": "a32334f55506f151dda4e05ef2914eb99ffa7eb0" + "reference": "f0aeadf42c05a8f20e2f012e2e421ebaae3b98f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-server/zipball/a32334f55506f151dda4e05ef2914eb99ffa7eb0", - "reference": "a32334f55506f151dda4e05ef2914eb99ffa7eb0", + "url": "https://api.github.com/repos/zf1s/zend-server/zipball/f0aeadf42c05a8f20e2f012e2e421ebaae3b98f6", + "reference": "f0aeadf42c05a8f20e2f012e2e421ebaae3b98f6", "shasum": "" }, "require": { "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-server": "^1.12" @@ -2364,28 +2069,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-server/tree/1.13.4" + "source": "https://github.com/zf1s/zend-server/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-service", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-service.git", - "reference": "076f58706356e195f39d84f7c86a17b2ba46d187" + "reference": "32d264cc0b2df7330b8aad69d2ac02f1fd33bd1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-service/zipball/076f58706356e195f39d84f7c86a17b2ba46d187", - "reference": "076f58706356e195f39d84f7c86a17b2ba46d187", + "url": "https://api.github.com/repos/zf1s/zend-service/zipball/32d264cc0b2df7330b8aad69d2ac02f1fd33bd1e", + "reference": "32d264cc0b2df7330b8aad69d2ac02f1fd33bd1e", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-http": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-http": "^1.14.0" }, "replace": { "zf1/zend-service": "^1.12" @@ -2414,28 +2119,28 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-service/tree/1.13.4" + "source": "https://github.com/zf1s/zend-service/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-session", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-session.git", - "reference": "8674ffc7b9bc3609597ed8cfb1674c4d1f7dd501" + "reference": "6580432cd62f949574c829715e8585d5215a683d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-session/zipball/8674ffc7b9bc3609597ed8cfb1674c4d1f7dd501", - "reference": "8674ffc7b9bc3609597ed8cfb1674c4d1f7dd501", + "url": "https://api.github.com/repos/zf1s/zend-session/zipball/6580432cd62f949574c829715e8585d5215a683d", + "reference": "6580432cd62f949574c829715e8585d5215a683d", "shasum": "" }, "require": { "ext-session": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-session": "^1.12" @@ -2469,31 +2174,31 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-session/tree/1.13.4" + "source": "https://github.com/zf1s/zend-session/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-uri", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-uri.git", - "reference": "ed7e1a712857418e27497aa40c2e2b8b74a54a81" + "reference": "5db2ded7a822a0d44351047e6052cbc92b92b785" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-uri/zipball/ed7e1a712857418e27497aa40c2e2b8b74a54a81", - "reference": "ed7e1a712857418e27497aa40c2e2b8b74a54a81", + "url": "https://api.github.com/repos/zf1s/zend-uri/zipball/5db2ded7a822a0d44351047e6052cbc92b92b785", + "reference": "5db2ded7a822a0d44351047e6052cbc92b92b785", "shasum": "" }, "require": { "ext-ctype": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-locale": "^1.13.4", - "zf1s/zend-validate": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-locale": "^1.14.0", + "zf1s/zend-validate": "^1.14.0" }, "replace": { "zf1/zend-uri": "^1.12" @@ -2527,31 +2232,31 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-uri/tree/1.13.4" + "source": "https://github.com/zf1s/zend-uri/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-validate", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-validate.git", - "reference": "4abe991139304c41a6344c6dbd85a118c0bad8d9" + "reference": "11eca1cb7b4c36ad1feda4c3a7cd5215f0e8b32e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-validate/zipball/4abe991139304c41a6344c6dbd85a118c0bad8d9", - "reference": "4abe991139304c41a6344c6dbd85a118c0bad8d9", + "url": "https://api.github.com/repos/zf1s/zend-validate/zipball/11eca1cb7b4c36ad1feda4c3a7cd5215f0e8b32e", + "reference": "11eca1cb7b4c36ad1feda4c3a7cd5215f0e8b32e", "shasum": "" }, "require": { "ext-ctype": "*", "ext-reflection": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-locale": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-locale": "^1.14.0" }, "replace": { "zf1/zend-validate": "^1.12" @@ -2586,22 +2291,22 @@ ], "support": { "issues": "https://github.com/zf1s/zend-validate/issues", - "source": "https://github.com/zf1s/zend-validate/tree/1.13.4" + "source": "https://github.com/zf1s/zend-validate/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-version", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-version.git", - "reference": "c51bebd557c8e0ca793f7b53bcab7887127e2bf3" + "reference": "0cbc15b7f7186bb95ea345c42c4fdc873a2e2424" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-version/zipball/c51bebd557c8e0ca793f7b53bcab7887127e2bf3", - "reference": "c51bebd557c8e0ca793f7b53bcab7887127e2bf3", + "url": "https://api.github.com/repos/zf1s/zend-version/zipball/0cbc15b7f7186bb95ea345c42c4fdc873a2e2424", + "reference": "0cbc15b7f7186bb95ea345c42c4fdc873a2e2424", "shasum": "" }, "require": { @@ -2634,32 +2339,32 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-version/tree/1.13.4" + "source": "https://github.com/zf1s/zend-version/tree/1.14.0" }, - "time": "2019-12-16T11:48:38+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-view", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-view.git", - "reference": "944ac8858af043f40693f87bb3b0f01993978e0b" + "reference": "e48f103dc707486ba65ed012985158fbe49e821f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-view/zipball/944ac8858af043f40693f87bb3b0f01993978e0b", - "reference": "944ac8858af043f40693f87bb3b0f01993978e0b", + "url": "https://api.github.com/repos/zf1s/zend-view/zipball/e48f103dc707486ba65ed012985158fbe49e821f", + "reference": "e48f103dc707486ba65ed012985158fbe49e821f", "shasum": "" }, "require": { "ext-reflection": "*", "php": ">=5.3.3", - "zf1s/zend-controller": "^1.13.4", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-loader": "^1.13.4", - "zf1s/zend-locale": "^1.13.4", - "zf1s/zend-registry": "^1.13.4" + "zf1s/zend-controller": "^1.14.0", + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-loader": "^1.14.0", + "zf1s/zend-locale": "^1.14.0", + "zf1s/zend-registry": "^1.14.0" }, "replace": { "zf1/zend-view": "^1.12" @@ -2692,22 +2397,22 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-view/tree/1.13.4" + "source": "https://github.com/zf1s/zend-view/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-xml", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-xml.git", - "reference": "6f717c478cffe913aea7c9bbb7f649fabe6a094d" + "reference": "15cbfb013e260e484fc8763403558a55e00bd8f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-xml/zipball/6f717c478cffe913aea7c9bbb7f649fabe6a094d", - "reference": "6f717c478cffe913aea7c9bbb7f649fabe6a094d", + "url": "https://api.github.com/repos/zf1s/zend-xml/zipball/15cbfb013e260e484fc8763403558a55e00bd8f6", + "reference": "15cbfb013e260e484fc8763403558a55e00bd8f6", "shasum": "" }, "require": { @@ -2715,7 +2420,7 @@ "ext-simplexml": "*", "ext-xml": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4" + "zf1s/zend-exception": "^1.14.0" }, "replace": { "zf1/zend-xml": "^1.12" @@ -2744,9 +2449,9 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-xml/tree/1.13.4" + "source": "https://github.com/zf1s/zend-xml/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" } ], "packages-dev": [ @@ -2930,16 +2635,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f" + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", "shasum": "" }, "require": { @@ -2974,9 +2679,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" }, - "time": "2021-09-17T15:28:14+00:00" + "time": "2021-10-02T14:08:47+00:00" }, { "name": "phpspec/prophecy", @@ -4125,23 +3830,23 @@ }, { "name": "zf1s/zend-dom", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-dom.git", - "reference": "ea1876ab9c3f6d59525b803c569d173e7f587c3f" + "reference": "e03fd6a03eebb438595aa24011b76f01bc93fa7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-dom/zipball/ea1876ab9c3f6d59525b803c569d173e7f587c3f", - "reference": "ea1876ab9c3f6d59525b803c569d173e7f587c3f", + "url": "https://api.github.com/repos/zf1s/zend-dom/zipball/e03fd6a03eebb438595aa24011b76f01bc93fa7f", + "reference": "e03fd6a03eebb438595aa24011b76f01bc93fa7f", "shasum": "" }, "require": { "ext-dom": "*", "php": ">=5.3.3", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-xml": "^1.13.4" + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-xml": "^1.14.0" }, "replace": { "zf1/zend-dom": "^1.12" @@ -4170,32 +3875,32 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-dom/tree/1.13.4" + "source": "https://github.com/zf1s/zend-dom/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" }, { "name": "zf1s/zend-test", - "version": "1.13.4", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/zf1s/zend-test.git", - "reference": "0afaa5b6075bba7074fff4bf36d5cb765fb44e51" + "reference": "811e2c8b910120d4450935b8953ecab9ab5e8642" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zf1s/zend-test/zipball/0afaa5b6075bba7074fff4bf36d5cb765fb44e51", - "reference": "0afaa5b6075bba7074fff4bf36d5cb765fb44e51", + "url": "https://api.github.com/repos/zf1s/zend-test/zipball/811e2c8b910120d4450935b8953ecab9ab5e8642", + "reference": "811e2c8b910120d4450935b8953ecab9ab5e8642", "shasum": "" }, "require": { "php": ">=5.3.3", - "zf1s/zend-controller": "^1.13.4", - "zf1s/zend-dom": "^1.13.4", - "zf1s/zend-exception": "^1.13.4", - "zf1s/zend-layout": "^1.13.4", - "zf1s/zend-registry": "^1.13.4", - "zf1s/zend-session": "^1.13.4" + "zf1s/zend-controller": "^1.14.0", + "zf1s/zend-dom": "^1.14.0", + "zf1s/zend-exception": "^1.14.0", + "zf1s/zend-layout": "^1.14.0", + "zf1s/zend-registry": "^1.14.0", + "zf1s/zend-session": "^1.14.0" }, "replace": { "zf1/zend-test": "^1.12" @@ -4227,15 +3932,15 @@ "zend" ], "support": { - "source": "https://github.com/zf1s/zend-test/tree/1.13.4" + "source": "https://github.com/zf1s/zend-test/tree/1.14.0" }, - "time": "2020-11-23T08:37:28+00:00" + "time": "2021-10-01T14:41:55+00:00" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "james-heinrich/getid3": 20 + "jooola/propel1": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/legacy/public/setup/database-setup.php b/legacy/public/setup/database-setup.php index d72f88e14..25da7b6db 100644 --- a/legacy/public/setup/database-setup.php +++ b/legacy/public/setup/database-setup.php @@ -167,7 +167,7 @@ class DatabaseSetup extends Setup */ private function createDatabaseTables() { - $sqlDir = dirname(dirname(__DIR__)) . '/build/sql/'; + $sqlDir = dirname(__DIR__, 2) . '/build/sql/'; $files = ['schema.sql', 'sequences.sql', 'views.sql', 'triggers.sql', 'defaultdata.sql']; foreach ($files as $f) { try { diff --git a/legacy/public/setup/general-setup.php b/legacy/public/setup/general-setup.php index fb29e3d49..901b2245a 100644 --- a/legacy/public/setup/general-setup.php +++ b/legacy/public/setup/general-setup.php @@ -1,24 +1,24 @@