Move to new directory structure

nextcloud · Jul 23, 2016 · 004fcbb · 004fcbb
1 parent 60abc0e
commit 004fcbb
Show file tree

Hide file tree

Showing 120 changed files with 7 additions and 207 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ php:
     - 7
 env:
     global:
-        - CORE_BRANCH=stable9
+        - CORE_BRANCH=stable10
     matrix:
         - DB=pgsql
 

diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 [![irc](https://img.shields.io/badge/irc%20channel-%23nextcloud--news%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-news)
 
 [![Build Status](https://travis-ci.org/nextcloud/news.svg?branch=master)](https://travis-ci.org/nextcloud/news)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/news/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/news/?branch=master)
 
 
 The News app is an RSS/Atom feed aggregator. It offers a [RESTful API](https://github.com/nextcloud/news/tree/master/docs/externalapi) for app developers. The source code is [available on GitHub](https://github.com/nextcloud/news)

diff --git a/appinfo/preupdate.php b/appinfo/preupdate.php
diff --git a/config/schema.json b/config/schema.json
diff --git a/appinfo/application.php → lib/AppInfo/Application.php b/appinfo/application.php → lib/AppInfo/Application.php
@@ -46,10 +46,10 @@ public function __construct(array $urlParams=[]) {
 
         // files
         $this->registerFileContents('checksums', 'checksum.json');
-        $this->registerFileContents('info', 'info.xml');
+        $this->registerFileContents('info',  '../../appinfo/info.xml');
 
         // parameters
-        $this->registerParameter('exploreDir', __DIR__ . '/../explore/feeds');
+        $this->registerParameter('exploreDir', '../Explore/feeds');
         $this->registerParameter('configFile', 'config.ini');
 
         // factories

diff --git a/command/updater/afterupdate.php → lib/Command/Updater/AfterUpdate.php b/command/updater/afterupdate.php → lib/Command/Updater/AfterUpdate.php
diff --git a/command/updater/allfeeds.php → lib/Command/Updater/AllFeeds.php b/command/updater/allfeeds.php → lib/Command/Updater/AllFeeds.php
diff --git a/command/updater/beforeupdate.php → lib/Command/Updater/BeforeUpdate.php b/command/updater/beforeupdate.php → lib/Command/Updater/BeforeUpdate.php
diff --git a/command/updater/updatefeed.php → lib/Command/Updater/UpdateFeed.php b/command/updater/updatefeed.php → lib/Command/Updater/UpdateFeed.php
diff --git a/config/appconfig.php → lib/Config/AppConfig.php b/config/appconfig.php → lib/Config/AppConfig.php
diff --git a/config/config.php → lib/Config/Config.php b/config/config.php → lib/Config/Config.php
diff --git a/config/dependencyexception.php → lib/Config/DependencyException.php b/config/dependencyexception.php → lib/Config/DependencyException.php
diff --git a/controller/admincontroller.php → lib/Controller/AdminController.php b/controller/admincontroller.php → lib/Controller/AdminController.php
diff --git a/controller/apicontroller.php → lib/Controller/ApiController.php b/controller/apicontroller.php → lib/Controller/ApiController.php
diff --git a/controller/entityapiserializer.php → lib/Controller/EntityApiSerializer.php b/controller/entityapiserializer.php → lib/Controller/EntityApiSerializer.php
diff --git a/controller/exportcontroller.php → lib/Controller/ExportController.php b/controller/exportcontroller.php → lib/Controller/ExportController.php
diff --git a/controller/feedapicontroller.php → lib/Controller/FeedApiController.php b/controller/feedapicontroller.php → lib/Controller/FeedApiController.php
diff --git a/controller/feedcontroller.php → lib/Controller/FeedController.php b/controller/feedcontroller.php → lib/Controller/FeedController.php
diff --git a/controller/folderapicontroller.php → lib/Controller/FolderApiController.php b/controller/folderapicontroller.php → lib/Controller/FolderApiController.php
diff --git a/controller/foldercontroller.php → lib/Controller/FolderController.php b/controller/foldercontroller.php → lib/Controller/FolderController.php
diff --git a/controller/itemapicontroller.php → lib/Controller/ItemApiController.php b/controller/itemapicontroller.php → lib/Controller/ItemApiController.php
diff --git a/controller/itemcontroller.php → lib/Controller/ItemController.php b/controller/itemcontroller.php → lib/Controller/ItemController.php
diff --git a/controller/jsonhttperror.php → lib/Controller/JSONHttpError.php b/controller/jsonhttperror.php → lib/Controller/JSONHttpError.php
diff --git a/controller/pagecontroller.php → lib/Controller/PageController.php b/controller/pagecontroller.php → lib/Controller/PageController.php
@@ -174,7 +174,7 @@ public function manifest() {
 
         foreach ($iconSizes as $size) {
             $filename = 'app-' . $size . '.png';
-            if (file_exists(__DIR__ . '/../img/' . $filename)) {
+            if (file_exists(__DIR__ . '/../../img/' . $filename)) {
                 $icons[$size] = $this->urlGenerator->imagePath($config['id'],
                     $filename);
             }

diff --git a/controller/userapicontroller.php → lib/Controller/UserApiController.php b/controller/userapicontroller.php → lib/Controller/UserApiController.php
diff --git a/controller/utilityapicontroller.php → lib/Controller/UtilityApiController.php b/controller/utilityapicontroller.php → lib/Controller/UtilityApiController.php
diff --git a/cron/updater.php → lib/Cron/Updater.php b/cron/updater.php → lib/Cron/Updater.php
diff --git a/db/entityjsonserializer.php → lib/Db/EntityJSONSerializer.php b/db/entityjsonserializer.php → lib/Db/EntityJSONSerializer.php
diff --git a/db/feed.php → lib/Db/Feed.php b/db/feed.php → lib/Db/Feed.php
diff --git a/db/feedmapper.php → lib/Db/FeedMapper.php b/db/feedmapper.php → lib/Db/FeedMapper.php
diff --git a/db/feedtype.php → lib/Db/FeedType.php b/db/feedtype.php → lib/Db/FeedType.php
diff --git a/db/folder.php → lib/Db/Folder.php b/db/folder.php → lib/Db/Folder.php
diff --git a/db/foldermapper.php → lib/Db/FolderMapper.php b/db/foldermapper.php → lib/Db/FolderMapper.php
diff --git a/db/iapi.php → lib/Db/IAPI.php b/db/iapi.php → lib/Db/IAPI.php
diff --git a/db/item.php → lib/Db/Item.php b/db/item.php → lib/Db/Item.php
diff --git a/db/itemmapper.php → lib/Db/ItemMapper.php b/db/itemmapper.php → lib/Db/ItemMapper.php
diff --git a/db/mapperfactory.php → lib/Db/MapperFactory.php b/db/mapperfactory.php → lib/Db/MapperFactory.php
diff --git a/db/mysql/itemmapper.php → lib/Db/Mysql/ItemMapper.php b/db/mysql/itemmapper.php → lib/Db/Mysql/ItemMapper.php
diff --git a/db/newsmapper.php → lib/Db/NewsMapper.php b/db/newsmapper.php → lib/Db/NewsMapper.php
diff --git a/db/statusflag.php → lib/Db/StatusFlag.php b/db/statusflag.php → lib/Db/StatusFlag.php
diff --git a/dependencyinjection/ifactory.php → lib/DependencyInjection/IFactory.php b/dependencyinjection/ifactory.php → lib/DependencyInjection/IFactory.php
diff --git a/explore/recommendedsitenotfoundexception.php → ...lore/RecommendedSiteNotFoundException.php b/explore/recommendedsitenotfoundexception.php → ...lore/RecommendedSiteNotFoundException.php
diff --git a/explore/recommendedsites.php → lib/Explore/RecommendedSites.php b/explore/recommendedsites.php → lib/Explore/RecommendedSites.php
diff --git a/explore/feeds/feeds.de.json → lib/Explore/feeds/feeds.de.json b/explore/feeds/feeds.de.json → lib/Explore/feeds/feeds.de.json
diff --git a/explore/feeds/feeds.en.json → lib/Explore/feeds/feeds.en.json b/explore/feeds/feeds.en.json → lib/Explore/feeds/feeds.en.json
diff --git a/fetcher/feedfetcher.php → lib/Fetcher/FeedFetcher.php b/fetcher/feedfetcher.php → lib/Fetcher/FeedFetcher.php
diff --git a/fetcher/fetcher.php → lib/Fetcher/Fetcher.php b/fetcher/fetcher.php → lib/Fetcher/Fetcher.php
diff --git a/fetcher/fetcherexception.php → lib/Fetcher/FetcherException.php b/fetcher/fetcherexception.php → lib/Fetcher/FetcherException.php
diff --git a/fetcher/ifeedfetcher.php → lib/Fetcher/IFeedFetcher.php b/fetcher/ifeedfetcher.php → lib/Fetcher/IFeedFetcher.php
diff --git a/fetcher/youtubefetcher.php → lib/Fetcher/YoutubeFetcher.php b/fetcher/youtubefetcher.php → lib/Fetcher/YoutubeFetcher.php
diff --git a/hooks/user.php → lib/Hooks/User.php b/hooks/user.php → lib/Hooks/User.php
diff --git a/http/textdownloadresponse.php → lib/Http/TextDownloadResponse.php b/http/textdownloadresponse.php → lib/Http/TextDownloadResponse.php
diff --git a/http/textresponse.php → lib/Http/TextResponse.php b/http/textresponse.php → lib/Http/TextResponse.php
diff --git a/plugin/client/plugin.php → lib/Plugin/Client/Plugin.php b/plugin/client/plugin.php → lib/Plugin/Client/Plugin.php
diff --git a/service/feedservice.php → lib/Service/FeedService.php b/service/feedservice.php → lib/Service/FeedService.php
diff --git a/service/folderservice.php → lib/Service/FolderService.php b/service/folderservice.php → lib/Service/FolderService.php
diff --git a/service/itemservice.php → lib/Service/ItemService.php b/service/itemservice.php → lib/Service/ItemService.php
diff --git a/service/service.php → lib/Service/Service.php b/service/service.php → lib/Service/Service.php
diff --git a/service/serviceconflictexception.php → lib/Service/ServiceConflictException.php b/service/serviceconflictexception.php → lib/Service/ServiceConflictException.php
diff --git a/service/serviceexception.php → lib/Service/ServiceException.php b/service/serviceexception.php → lib/Service/ServiceException.php
diff --git a/service/servicenotfoundexception.php → lib/Service/ServiceNotFoundException.php b/service/servicenotfoundexception.php → lib/Service/ServiceNotFoundException.php
diff --git a/service/servicevalidationexception.php → lib/Service/ServiceValidationException.php b/service/servicevalidationexception.php → lib/Service/ServiceValidationException.php
diff --git a/service/statusservice.php → lib/Service/StatusService.php b/service/statusservice.php → lib/Service/StatusService.php
diff --git a/upgrade/upgrade.php → lib/Upgrade/Upgrade.php b/upgrade/upgrade.php → lib/Upgrade/Upgrade.php
diff --git a/utility/opmlexporter.php → lib/Utility/OPMLExporter.php b/utility/opmlexporter.php → lib/Utility/OPMLExporter.php
diff --git a/utility/picofeedclientfactory.php → lib/Utility/PicoFeedClientFactory.php b/utility/picofeedclientfactory.php → lib/Utility/PicoFeedClientFactory.php
diff --git a/utility/picofeedfaviconfactory.php → lib/Utility/PicoFeedFaviconFactory.php b/utility/picofeedfaviconfactory.php → lib/Utility/PicoFeedFaviconFactory.php
diff --git a/utility/proxyconfigparser.php → lib/Utility/ProxyConfigParser.php b/utility/proxyconfigparser.php → lib/Utility/ProxyConfigParser.php
diff --git a/utility/time.php → lib/Utility/Time.php b/utility/time.php → lib/Utility/Time.php
diff --git a/utility/updater.php → lib/Utility/Updater.php b/utility/updater.php → lib/Utility/Updater.php
diff --git a/phpunit.integration.xml b/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="integration">
-            <directory>./tests/integration</directory>
+            <directory>./tests/Integration</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="unit">
-            <directory>./tests/unit</directory>
+            <directory>./tests/Unit</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/integration/db/FeedMapperTest.php → tests/Integration/Db/FeedMapperTest.php b/tests/integration/db/FeedMapperTest.php → tests/Integration/Db/FeedMapperTest.php
diff --git a/tests/integration/db/FolderMapperTest.php → tests/Integration/Db/FolderMapperTest.php b/tests/integration/db/FolderMapperTest.php → tests/Integration/Db/FolderMapperTest.php
diff --git a/tests/integration/db/ItemMapperTest.php → tests/Integration/Db/ItemMapperTest.php b/tests/integration/db/ItemMapperTest.php → tests/Integration/Db/ItemMapperTest.php
diff --git a/tests/integration/fixtures/feedfixture.php → tests/Integration/Fixtures/FeedFixture.php b/tests/integration/fixtures/feedfixture.php → tests/Integration/Fixtures/FeedFixture.php
diff --git a/tests/integration/fixtures/fixture.php → tests/Integration/Fixtures/Fixture.php b/tests/integration/fixtures/fixture.php → tests/Integration/Fixtures/Fixture.php
diff --git a/tests/integration/fixtures/folderfixture.php → tests/Integration/Fixtures/FolderFixture.php b/tests/integration/fixtures/folderfixture.php → tests/Integration/Fixtures/FolderFixture.php
diff --git a/tests/integration/fixtures/itemfixture.php → tests/Integration/Fixtures/ItemFixture.php b/tests/integration/fixtures/itemfixture.php → tests/Integration/Fixtures/ItemFixture.php
diff --git a/tests/integration/fixtures/data/default.php → tests/Integration/Fixtures/data/default.php b/tests/integration/fixtures/data/default.php → tests/Integration/Fixtures/data/default.php
diff --git a/tests/integration/fixtures/data/readitem.php → tests/Integration/Fixtures/data/readitem.php b/tests/integration/fixtures/data/readitem.php → tests/Integration/Fixtures/data/readitem.php
diff --git a/tests/integration/integrationtest.php → tests/Integration/IntegrationTest.php b/tests/integration/integrationtest.php → tests/Integration/IntegrationTest.php
@@ -102,7 +102,7 @@ protected function findFeedByTitle($title) {
      * @param string $name loads fixtures from a given file
      */
     protected function loadFixtures($name) {
-        $fixtures = include __DIR__ . '/fixtures/data/' . $name . '.php';
+        $fixtures = include __DIR__ . '/Fixtures/data/' . $name . '.php';
         if (array_key_exists('folders', $fixtures)) {
             $this->loadFolderFixtures($fixtures['folders']);
         }

diff --git a/tests/unit/config/ConfigTest.php → tests/Unit/Config/ConfigTest.php b/tests/unit/config/ConfigTest.php → tests/Unit/Config/ConfigTest.php
diff --git a/...s/unit/controller/AdminControllerTest.php → ...s/Unit/Controller/AdminControllerTest.php b/...s/unit/controller/AdminControllerTest.php → ...s/Unit/Controller/AdminControllerTest.php
diff --git a/...it/controller/EntityApiSerializerTest.php → ...it/Controller/EntityApiSerializerTest.php b/...it/controller/EntityApiSerializerTest.php → ...it/Controller/EntityApiSerializerTest.php
diff --git a/.../unit/controller/ExportControllerTest.php → .../Unit/Controller/ExportControllerTest.php b/.../unit/controller/ExportControllerTest.php → .../Unit/Controller/ExportControllerTest.php
diff --git a/...unit/controller/FeedApiControllerTest.php → ...Unit/Controller/FeedApiControllerTest.php b/...unit/controller/FeedApiControllerTest.php → ...Unit/Controller/FeedApiControllerTest.php
diff --git a/tests/unit/controller/FeedControllerTest.php → tests/Unit/Controller/FeedControllerTest.php b/tests/unit/controller/FeedControllerTest.php → tests/Unit/Controller/FeedControllerTest.php
diff --git a/...it/controller/FolderApiControllerTest.php → ...it/Controller/FolderApiControllerTest.php b/...it/controller/FolderApiControllerTest.php → ...it/Controller/FolderApiControllerTest.php
diff --git a/.../unit/controller/FolderControllerTest.php → .../Unit/Controller/FolderControllerTest.php b/.../unit/controller/FolderControllerTest.php → .../Unit/Controller/FolderControllerTest.php
diff --git a/...unit/controller/ItemApiControllerTest.php → ...Unit/Controller/ItemApiControllerTest.php b/...unit/controller/ItemApiControllerTest.php → ...Unit/Controller/ItemApiControllerTest.php
diff --git a/tests/unit/controller/ItemControllerTest.php → tests/Unit/Controller/ItemControllerTest.php b/tests/unit/controller/ItemControllerTest.php → tests/Unit/Controller/ItemControllerTest.php
diff --git a/tests/unit/controller/JSONHttpErrorTest.php → tests/Unit/Controller/JSONHttpErrorTest.php b/tests/unit/controller/JSONHttpErrorTest.php → tests/Unit/Controller/JSONHttpErrorTest.php
diff --git a/tests/unit/controller/PageControllerTest.php → tests/Unit/Controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php → tests/Unit/Controller/PageControllerTest.php
diff --git a/...unit/controller/UserApiControllerTest.php → ...Unit/Controller/UserApiControllerTest.php b/...unit/controller/UserApiControllerTest.php → ...Unit/Controller/UserApiControllerTest.php
diff --git a/...t/controller/UtilityApiControllerTest.php → ...t/Controller/UtilityApiControllerTest.php b/...t/controller/UtilityApiControllerTest.php → ...t/Controller/UtilityApiControllerTest.php
diff --git a/tests/unit/db/FeedMapperTest.php → tests/Unit/Db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php → tests/Unit/Db/FeedMapperTest.php
diff --git a/tests/unit/db/FeedTest.php → tests/Unit/Db/FeedTest.php b/tests/unit/db/FeedTest.php → tests/Unit/Db/FeedTest.php
diff --git a/tests/unit/db/FolderMapperTest.php → tests/Unit/Db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php → tests/Unit/Db/FolderMapperTest.php
diff --git a/tests/unit/db/FolderTest.php → tests/Unit/Db/FolderTest.php b/tests/unit/db/FolderTest.php → tests/Unit/Db/FolderTest.php
diff --git a/tests/unit/db/ItemMapperTest.php → tests/Unit/Db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php → tests/Unit/Db/ItemMapperTest.php
diff --git a/tests/unit/db/ItemTest.php → tests/Unit/Db/ItemTest.php b/tests/unit/db/ItemTest.php → tests/Unit/Db/ItemTest.php
diff --git a/tests/unit/db/MapperFactoryTest.php → tests/Unit/Db/MapperFactoryTest.php b/tests/unit/db/MapperFactoryTest.php → tests/Unit/Db/MapperFactoryTest.php
diff --git a/tests/unit/db/mappertestutility.php → tests/Unit/Db/MapperTestUtility.php b/tests/unit/db/mappertestutility.php → tests/Unit/Db/MapperTestUtility.php
diff --git a/tests/unit/db/mysql/ItemMapperTest.php → tests/Unit/Db/Mysql/ItemMapperTest.php b/tests/unit/db/mysql/ItemMapperTest.php → tests/Unit/Db/Mysql/ItemMapperTest.php
diff --git a/tests/unit/fetcher/FeedFetcherTest.php → tests/Unit/Fetcher/FeedFetcherTest.php b/tests/unit/fetcher/FeedFetcherTest.php → tests/Unit/Fetcher/FeedFetcherTest.php
diff --git a/tests/unit/fetcher/FetcherTest.php → tests/Unit/Fetcher/FetcherTest.php b/tests/unit/fetcher/FetcherTest.php → tests/Unit/Fetcher/FetcherTest.php
diff --git a/tests/unit/fetcher/YoutubeFetcherTest.php → tests/Unit/Fetcher/YoutubeFetcherTest.php b/tests/unit/fetcher/YoutubeFetcherTest.php → tests/Unit/Fetcher/YoutubeFetcherTest.php
diff --git a/tests/unit/http/TextDownloadResponseTest.php → tests/Unit/Http/TextDownloadResponseTest.php b/tests/unit/http/TextDownloadResponseTest.php → tests/Unit/Http/TextDownloadResponseTest.php
diff --git a/tests/unit/http/TextResponseTest.php → tests/Unit/Http/TextResponseTest.php b/tests/unit/http/TextResponseTest.php → tests/Unit/Http/TextResponseTest.php
diff --git a/tests/unit/service/FeedServiceTest.php → tests/Unit/Service/FeedServiceTest.php b/tests/unit/service/FeedServiceTest.php → tests/Unit/Service/FeedServiceTest.php
diff --git a/tests/unit/service/FolderServiceTest.php → tests/Unit/Service/FolderServiceTest.php b/tests/unit/service/FolderServiceTest.php → tests/Unit/Service/FolderServiceTest.php
diff --git a/tests/unit/service/ItemServiceTest.php → tests/Unit/Service/ItemServiceTest.php b/tests/unit/service/ItemServiceTest.php → tests/Unit/Service/ItemServiceTest.php
diff --git a/tests/unit/service/ServiceTest.php → tests/Unit/Service/ServiceTest.php b/tests/unit/service/ServiceTest.php → tests/Unit/Service/ServiceTest.php
diff --git a/tests/unit/service/StatusFlagTest.php → tests/Unit/Service/StatusFlagTest.php b/tests/unit/service/StatusFlagTest.php → tests/Unit/Service/StatusFlagTest.php
diff --git a/tests/unit/service/StatusServiceTest.php → tests/Unit/Service/StatusServiceTest.php b/tests/unit/service/StatusServiceTest.php → tests/Unit/Service/StatusServiceTest.php
diff --git a/tests/unit/upgrade/UpgradeTest.php → tests/Unit/Upgrade/UpgradeTest.php b/tests/unit/upgrade/UpgradeTest.php → tests/Unit/Upgrade/UpgradeTest.php
diff --git a/tests/unit/utility/OPMLExporterTest.php → tests/Unit/Utility/OPMLExporterTest.php b/tests/unit/utility/OPMLExporterTest.php → tests/Unit/Utility/OPMLExporterTest.php
diff --git a/tests/unit/utility/ProxyConfigParserTest.php → tests/Unit/Utility/ProxyConfigParserTest.php b/tests/unit/utility/ProxyConfigParserTest.php → tests/Unit/Utility/ProxyConfigParserTest.php
diff --git a/tests/unit/utility/UpdaterTest.php → tests/Unit/Utility/UpdaterTest.php b/tests/unit/utility/UpdaterTest.php → tests/Unit/Utility/UpdaterTest.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ php: @@
         - 7
     env:
         global:
-            - CORE_BRANCH=stable9
+            - CORE_BRANCH=stable10
         matrix:
             - DB=pgsql
@@ Expand Down @@