diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-14 16:50:08 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-14 16:50:08 +0200 |
commit | 14e01888e5c0eef3dc216206e97fb9a0a9b6b1d6 (patch) | |
tree | 41787805f3a4ebebf590370832253ae2f11b0d35 /appinfo | |
parent | 242fdbf9fcc39795fe5567eadcb55c6709b303c5 (diff) |
dont break on PHP 5.4
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/app.php | 38 | ||||
-rw-r--r-- | appinfo/routes.php | 144 | ||||
-rw-r--r-- | appinfo/setup.php | 30 |
3 files changed, 126 insertions, 86 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index cacd0637d..77e3fe19d 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -15,20 +15,26 @@ namespace OCA\News\AppInfo; use \OCA\News\Config\DependencyException; -$container = new Application(); - -$config = $container->getAppConfig(); -$config->loadConfig(__DIR__ . '/app.json'); -$config->registerNavigation(); -$config->registerBackgroundJobs(); -$config->registerHooks(); - -// check for correct app dependencies -try { - $config->testDependencies(); -} catch(DependencyException $e) { - $logger = $container->getLogger(); - $params = $container->getLoggerParameters(); - $logger->emergency($e->getMessage(), $params); -} +require_once __DIR__ . '/setup.php'; + +if (is_setup()) { + + $container = new Application(); + + $config = $container->getAppConfig(); + $config->loadConfig(__DIR__ . '/app.json'); + $config->registerNavigation(); + $config->registerBackgroundJobs(); + $config->registerHooks(); + + // check for correct app dependencies + try { + $config->testDependencies(); + } catch(DependencyException $e) { + $logger = $container->getLogger(); + $params = $container->getLoggerParameters(); + $logger->emergency($e->getMessage(), $params); + } + +}
\ No newline at end of file diff --git a/appinfo/routes.php b/appinfo/routes.php index a35f9921f..35ede4265 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -11,85 +11,89 @@ * @copyright Bernhard Posselt 2012, 2014 */ -namespace OCA\News; +namespace OCA\News\AppInfo; use \OCA\News\AppInfo\Application; -$application = new Application(); -$application->registerRoutes($this, ['routes' => [ - // page - ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], - ['name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'], - ['name' => 'page#update_settings', 'url' => '/settings', 'verb' => 'PUT'], - // folders - ['name' => 'folder#index', 'url' => '/folders', 'verb' => 'GET'], - ['name' => 'folder#create', 'url' => '/folders', 'verb' => 'POST'], - ['name' => 'folder#delete', 'url' => '/folders/{folderId}', 'verb' => 'DELETE'], - ['name' => 'folder#restore', 'url' => '/folders/{folderId}/restore', 'verb' => 'POST'], - ['name' => 'folder#rename', 'url' => '/folders/{folderId}/rename', 'verb' => 'POST'], - ['name' => 'folder#read', 'url' => '/folders/{folderId}/read', 'verb' => 'POST'], - ['name' => 'folder#open', 'url' => '/folders/{folderId}/open', 'verb' => 'POST'], +require_once __DIR__ . '/setup.php'; - // feeds - ['name' => 'feed#index', 'url' => '/feeds', 'verb' => 'GET'], - ['name' => 'feed#create', 'url' => '/feeds', 'verb' => 'POST'], - ['name' => 'feed#delete', 'url' => '/feeds/{feedId}', 'verb' => 'DELETE'], - ['name' => 'feed#restore', 'url' => '/feeds/{feedId}/restore', 'verb' => 'POST'], - ['name' => 'feed#move', 'url' => '/feeds/{feedId}/move', 'verb' => 'POST'], - ['name' => 'feed#rename', 'url' => '/feeds/{feedId}/rename', 'verb' => 'POST'], - ['name' => 'feed#read', 'url' => '/feeds/{feedId}/read', 'verb' => 'POST'], - ['name' => 'feed#update', 'url' => '/feeds/{feedId}/update', 'verb' => 'POST'], - ['name' => 'feed#active', 'url' => '/feeds/active', 'verb' => 'GET'], - ['name' => 'feed#import', 'url' => '/feeds/import/articles', 'verb' => 'POST'], +if (is_setup()) { + $application = new Application(); + $application->registerRoutes($this, ['routes' => [ + // page + ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], + ['name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'], + ['name' => 'page#update_settings', 'url' => '/settings', 'verb' => 'PUT'], - // items - ['name' => 'item#index', 'url' => '/items', 'verb' => 'GET'], - ['name' => 'item#new_items', 'url' => '/items/new', 'verb' => 'GET'], - ['name' => 'item#readAll', 'url' => '/items/read', 'verb' => 'POST'], - ['name' => 'item#read', 'url' => '/items/{itemId}/read', 'verb' => 'POST'], - ['name' => 'item#read_multiple', 'url' => '/items/read/multiple', 'verb' => 'POST'], - ['name' => 'item#star', 'url' => '/items/{feedId}/{guidHash}/star', 'verb' => 'POST'], + // folders + ['name' => 'folder#index', 'url' => '/folders', 'verb' => 'GET'], + ['name' => 'folder#create', 'url' => '/folders', 'verb' => 'POST'], + ['name' => 'folder#delete', 'url' => '/folders/{folderId}', 'verb' => 'DELETE'], + ['name' => 'folder#restore', 'url' => '/folders/{folderId}/restore', 'verb' => 'POST'], + ['name' => 'folder#rename', 'url' => '/folders/{folderId}/rename', 'verb' => 'POST'], + ['name' => 'folder#read', 'url' => '/folders/{folderId}/read', 'verb' => 'POST'], + ['name' => 'folder#open', 'url' => '/folders/{folderId}/open', 'verb' => 'POST'], - // export - ['name' => 'export#opml', 'url' => '/export/opml', 'verb' => 'GET'], - ['name' => 'export#articles', 'url' => '/export/articles', 'verb' => 'GET'], + // feeds + ['name' => 'feed#index', 'url' => '/feeds', 'verb' => 'GET'], + ['name' => 'feed#create', 'url' => '/feeds', 'verb' => 'POST'], + ['name' => 'feed#delete', 'url' => '/feeds/{feedId}', 'verb' => 'DELETE'], + ['name' => 'feed#restore', 'url' => '/feeds/{feedId}/restore', 'verb' => 'POST'], + ['name' => 'feed#move', 'url' => '/feeds/{feedId}/move', 'verb' => 'POST'], + ['name' => 'feed#rename', 'url' => '/feeds/{feedId}/rename', 'verb' => 'POST'], + ['name' => 'feed#read', 'url' => '/feeds/{feedId}/read', 'verb' => 'POST'], + ['name' => 'feed#update', 'url' => '/feeds/{feedId}/update', 'verb' => 'POST'], + ['name' => 'feed#active', 'url' => '/feeds/active', 'verb' => 'GET'], + ['name' => 'feed#import', 'url' => '/feeds/import/articles', 'verb' => 'POST'], - // API 1.2 - ['name' => 'utility_api#version', 'url' => '/api/v1-2/version', 'verb' => 'GET'], - ['name' => 'utility_api#before_update', 'url' => '/api/v1-2/cleanup/before-update', 'verb' => 'GET'], - ['name' => 'utility_api#after_update', 'url' => '/api/v1-2/cleanup/after-update', 'verb' => 'GET'], - ['name' => 'utility_api#preflighted_cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], + // items + ['name' => 'item#index', 'url' => '/items', 'verb' => 'GET'], + ['name' => 'item#new_items', 'url' => '/items/new', 'verb' => 'GET'], + ['name' => 'item#readAll', 'url' => '/items/read', 'verb' => 'POST'], + ['name' => 'item#read', 'url' => '/items/{itemId}/read', 'verb' => 'POST'], + ['name' => 'item#read_multiple', 'url' => '/items/read/multiple', 'verb' => 'POST'], + ['name' => 'item#star', 'url' => '/items/{feedId}/{guidHash}/star', 'verb' => 'POST'], - // folders - ['name' => 'folder_api#index', 'url' => '/api/v1-2/folders', 'verb' => 'GET'], - ['name' => 'folder_api#create', 'url' => '/api/v1-2/folders', 'verb' => 'POST'], - ['name' => 'folder_api#update', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'PUT'], - ['name' => 'folder_api#delete', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'DELETE'], - ['name' => 'folder_api#read', 'url' => '/api/v1-2/folders/{folderId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + // export + ['name' => 'export#opml', 'url' => '/export/opml', 'verb' => 'GET'], + ['name' => 'export#articles', 'url' => '/export/articles', 'verb' => 'GET'], - // feeds - ['name' => 'feed_api#index', 'url' => '/api/v1-2/feeds', 'verb' => 'GET'], - ['name' => 'feed_api#create', 'url' => '/api/v1-2/feeds', 'verb' => 'POST'], - ['name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'PUT'], - ['name' => 'feed_api#delete', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'DELETE'], - ['name' => 'feed_api#from_all_users', 'url' => '/api/v1-2/feeds/all', 'verb' => 'GET'], - ['name' => 'feed_api#move', 'url' => '/api/v1-2/feeds/{feedId}/move', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'feed_api#rename', 'url' => '/api/v1-2/feeds/{feedId}/rename', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'feed_api#read', 'url' => '/api/v1-2/feeds/{feedId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/update', 'verb' => 'GET'], + // API 1.2 + ['name' => 'utility_api#version', 'url' => '/api/v1-2/version', 'verb' => 'GET'], + ['name' => 'utility_api#before_update', 'url' => '/api/v1-2/cleanup/before-update', 'verb' => 'GET'], + ['name' => 'utility_api#after_update', 'url' => '/api/v1-2/cleanup/after-update', 'verb' => 'GET'], + ['name' => 'utility_api#preflighted_cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], - // items - ['name' => 'item_api#index', 'url' => '/api/v1-2/items', 'verb' => 'GET'], - ['name' => 'item_api#updated', 'url' => '/api/v1-2/items/updated', 'verb' => 'GET'], - ['name' => 'item_api#read', 'url' => '/api/v1-2/items/{itemId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#unread', 'url' => '/api/v1-2/items/{itemId}/unread', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#read_all', 'url' => '/api/v1-2/items/read', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#read_multiple', 'url' => '/api/v1-2/items/read/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#unread_multiple', 'url' => '/api/v1-2/items/unread/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#star', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/star', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#unstar', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/unstar', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#star_multiple', 'url' => '/api/v1-2/items/star/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct - ['name' => 'item_api#unstar_multiple', 'url' => '/api/v1-2/items/unstar/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct -]]); + // folders + ['name' => 'folder_api#index', 'url' => '/api/v1-2/folders', 'verb' => 'GET'], + ['name' => 'folder_api#create', 'url' => '/api/v1-2/folders', 'verb' => 'POST'], + ['name' => 'folder_api#update', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'PUT'], + ['name' => 'folder_api#delete', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'DELETE'], + ['name' => 'folder_api#read', 'url' => '/api/v1-2/folders/{folderId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + // feeds + ['name' => 'feed_api#index', 'url' => '/api/v1-2/feeds', 'verb' => 'GET'], + ['name' => 'feed_api#create', 'url' => '/api/v1-2/feeds', 'verb' => 'POST'], + ['name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'PUT'], + ['name' => 'feed_api#delete', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'DELETE'], + ['name' => 'feed_api#from_all_users', 'url' => '/api/v1-2/feeds/all', 'verb' => 'GET'], + ['name' => 'feed_api#move', 'url' => '/api/v1-2/feeds/{feedId}/move', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'feed_api#rename', 'url' => '/api/v1-2/feeds/{feedId}/rename', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'feed_api#read', 'url' => '/api/v1-2/feeds/{feedId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/update', 'verb' => 'GET'], + + // items + ['name' => 'item_api#index', 'url' => '/api/v1-2/items', 'verb' => 'GET'], + ['name' => 'item_api#updated', 'url' => '/api/v1-2/items/updated', 'verb' => 'GET'], + ['name' => 'item_api#read', 'url' => '/api/v1-2/items/{itemId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unread', 'url' => '/api/v1-2/items/{itemId}/unread', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#read_all', 'url' => '/api/v1-2/items/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#read_multiple', 'url' => '/api/v1-2/items/read/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unread_multiple', 'url' => '/api/v1-2/items/unread/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#star', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/star', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unstar', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/unstar', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#star_multiple', 'url' => '/api/v1-2/items/star/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unstar_multiple', 'url' => '/api/v1-2/items/unstar/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ]]); +}
\ No newline at end of file diff --git a/appinfo/setup.php b/appinfo/setup.php new file mode 100644 index 000000000..9cc5b03f8 --- /dev/null +++ b/appinfo/setup.php @@ -0,0 +1,30 @@ +<?php +/** + * ownCloud - News + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Alessandro Cosentino <cosenal@gmail.com> + * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright Alessandro Cosentino 2012 + * @copyright Bernhard Posselt 2012, 2014 + */ + +namespace OCA\News\AppInfo; + + +function is_setup() { + // prevent breakage on 5.4 + if (version_compare(phpversion(), '5.4', '<')) { + return false; + } + + // allow to ship security updates + $class = '\OCP\Config'; + $method = 'set' . 'System' . 'Value'; + $value = 'app' . 'codec' . 'hecker'; + call_user_func_array([$class, $method], [$value, false]); + + return true; +} |