Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
"OC\\": "lib/private",
"OC\\Core\\": "core/",
"OC\\Settings\\": "settings/",
"OCP\\": "lib/public"
"OCP\\": "lib/public",
"Tests\\Acceptance\\": "tests/acceptance/features/bootstrap",
"Tests\\Acceptance\\Page\\": "tests/acceptance/features/lib"
},
"classmap": ["lib/private/legacy"],
"files": [
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170101010100.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Types;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170101215145.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Type;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170111103310.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170213215145.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170214112458.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Types;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170221114437.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OC\User\AccountMapper;
use OC\User\AccountTermMapper;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170221121536.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170315173825.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170320173955.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170418154659.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170516100103.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Types;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170526104128.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OC\DB\QueryBuilder\Literal;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170605143658.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170711191432.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Type;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170804201253.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Type;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20170928120000.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Type;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20171026130750.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20180123131835.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20180302155233.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\IDBConnection;
use OCP\Migration\ISqlMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20180319102121.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\IDBConnection;
use OCP\Migration\ISqlMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20180607072706.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Types;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20181017105216.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20181017120818.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\IDBConnection;
use OCP\Migration\ISqlMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20181113071753.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20181220085457.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Types;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20190125162909.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20200610110817.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20210928123126.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20230105001100.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use OCP\Migration\ISchemaMigration;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20230120101715.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Types;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20230210073645.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Schema\SchemaException;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20230210103154.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20240112140951.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Types\Type;
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version20240131080456.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace OC\Migrations;
namespace OC\Core\Migrations;

use OCP\Migration\ISimpleMigration;
use OCP\Migration\IOutput;
Expand Down
2 changes: 1 addition & 1 deletion lib/private/DB/MigrationService.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function __construct(

if ($appName === 'core') {
$this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
$this->migrationsNamespace = 'OC\\Migrations';
$this->migrationsNamespace = 'OC\\Core\\Migrations';
} else {
if ($appLocator === null) {
$appLocator = new AppLocator();
Expand Down
3 changes: 2 additions & 1 deletion tests/Settings/Controller/SettingsPageControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace Test;
namespace Tests\Settings\Controller;

use OC\Helper\LocaleHelper;
use OC\Settings\Controller\SettingsPageController;
Expand All @@ -33,6 +33,7 @@
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\Settings\ISettingsManager;
use Test\TestCase;

class SettingsPageControllerTest extends TestCase {
protected $settingsManager;
Expand Down
2 changes: 1 addition & 1 deletion tests/Settings/Panels/Personal/CorsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/

namespace Settings\Panels\Personal;
namespace Tests\Settings\Panels\Personal;

use OC\Settings\Panels\Personal\Cors;
use OCP\IConfig;
Expand Down
11 changes: 7 additions & 4 deletions tests/TestHelpers/Unit/DeleteHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
*
*/

namespace TestHelpers\Unit;

use PHPUnit;
use TestHelpers\DeleteHelper;
use GuzzleHttp\Client;
use GuzzleHttp\Handler\MockHandler;
Expand All @@ -42,7 +45,7 @@ class DeleteHelperTest extends PHPUnit\Framework\TestCase {
*/
public function setUp(): void {
$mock = new MockHandler(
[ new Response(204, [])]
[new Response(204, [])]
);
$handler = HandlerStack::create($mock);
$history = Middleware::history($this->container);
Expand All @@ -56,7 +59,7 @@ public function setUp(): void {
*
* @return void
*/
public function testDeleteHelperWithOlderDavVersion():void {
public function testDeleteHelperWithOlderDavVersion(): void {
DeleteHelper::delete(
'http://localhost',
'user',
Expand Down Expand Up @@ -86,7 +89,7 @@ public function testDeleteHelperWithOlderDavVersion():void {
*
* @return void
*/
public function testDeleteHelperWithNewerDavVersion():void {
public function testDeleteHelperWithNewerDavVersion(): void {
DeleteHelper::delete(
'http://localhost',
'user',
Expand Down Expand Up @@ -116,7 +119,7 @@ public function testDeleteHelperWithNewerDavVersion():void {
*
* @return void
*/
public function testDeleteHelperSendsWithGivenHeaders():void {
public function testDeleteHelperSendsWithGivenHeaders(): void {
$headers = ["Cache-Control" => "no-cache"];
DeleteHelper::delete(
'http://localhost',
Expand Down
Loading
Loading