Move to new directory structure

This commit is contained in:
Bernhard Posselt 2016-07-23 21:24:54 +02:00
parent 60abc0ed44
commit 004fcbbcc7
120 changed files with 7 additions and 207 deletions

View File

@ -6,7 +6,7 @@ php:
- 7
env:
global:
- CORE_BRANCH=stable9
- CORE_BRANCH=stable10
matrix:
- DB=pgsql

View File

@ -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)

View File

@ -1,17 +0,0 @@
<?php
/**
* ownCloud - News
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @copyright Bernhard Posselt 2015
*/
namespace OCA\News\AppInfo;
use OCA\News\Upgrade\Upgrade;
$app = new Application();
$app->getContainer()->query(Upgrade::class)->preUpgrade();

View File

@ -1,182 +0,0 @@
{
"title": "ownCloud App Schema",
"type": "object",
"properties": {
"name": {
"type": "string"
},
"id": {
"type": "string",
"pattern": "^[a-z_]+$"
},
"description": {
"type": "string"
},
"licence": {
"type": "string",
"enum": ["AGPL", "MIT", "GPL", "LGPL", "BSD","Apache"]
},
"admin": {
"type": "boolean"
},
"version": {
"type": "string",
"pattern": "^[0-9]+(\\.[0-9]+)*$"
},
"authors": {
"type": "array",
"items": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"email": {
"type": "string",
"pattern": "^.+@.+\\..+$"
},
"homepage": {
"type": "string",
"pattern": "^https?://.*$"
}
},
"required": ["name", "email"],
"additionalProperties": false
}
},
"repository": {
"type": "object",
"properties": {
"type": {
"type": "string"
},
"url": {
"type": "string"
}
},
"required": ["type", "url"],
"additionalProperties": false
},
"homepage": {
"type": "string",
"pattern": "^https?://.*$"
},
"bugs": {
"type": "string",
"pattern": "^https?://.*$"
},
"documentation": {
"type": "object",
"properties": {
"user": {
"type": "string",
"pattern": "^https?://.*$"
},
"admin": {
"type": "string",
"pattern": "^https?://.*$"
},
"developer": {
"type": "string",
"pattern": "^https?://.*$"
}
},
"additionalProperties": false
},
"jobs": {
"type": "array",
"items": {
"type": "string",
"pattern": "^[a-zA-Z-_:\\\\]+$"
}
},
"hooks": {
"type": "object",
"patternProperties": {
"^[a-zA-Z-_:\\\\]+$": {
"type": "string",
"pattern": "^[a-zA-Z-_:\\\\]+$"
}
}
},
"navigation": {
"type": "object",
"properties": {
"route": {
"type": "string",
"pattern": "^([a-z]+(\\.[a-z]+)*)*|(/.+/.*)$"
},
"icon": {
"type": "string"
},
"name": {
"type": "string"
},
"order": {
"type": "integer"
}
},
"additionalProperties": false
},
"categories": {
"type": "array",
"items": {
"type": "string",
"enum": ["Filesystem", "Authentication", "PIM", "Multimedia",
"Productivity", "Games", "Tools", "Other"]
},
"minItems": 1,
"uniqueItems": true
},
"dependencies": {
"type": "object",
"properties": {
"databases": {
"type": "array",
"items": {
"type": "string",
"enum": ["pgsql", "mysql", "sqlite3", "mssql", "oracle"]
},
"uniqueItems": true
},
"php": {
"type": "string",
"pattern": "^((=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*(,(=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*)*|\\*)$"
},
"apps": {
"type": "object",
"patternProperties": {
"^[a-z_]+$": {
"type": "string",
"pattern": "^((=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*(,(=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*)*|\\*)$"
}
}
},
"libs": {
"type": "object",
"patternProperties": {
"^[a-z_]+$": {
"type": "string",
"pattern": "^((=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*(,(=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*)*|\\*)$"
}
}
},
"owncloud": {
"type": "string",
"pattern": "^((=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*(,(=|<|>|<=|>=)?[0-9]+(\\.[0-9]+)*)*|\\*)$"
}
},
"additionalProperties": false
}
},
"required": [
"name",
"id",
"description",
"licence",
"version",
"authors",
"repository"
],
"additionalProperties": false
}

View File

@ -46,10 +46,10 @@ class Application extends App {
// 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

View File

@ -174,7 +174,7 @@ class PageController extends Controller {
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);
}

View File

@ -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>

View File

@ -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>

View File

@ -102,7 +102,7 @@ abstract class IntegrationTest extends PHPUnit_Framework_TestCase {
* @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']);
}

Some files were not shown because too many files have changed in this diff Show More