diff options
42 files changed, 88 insertions, 174 deletions
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml index 3b7a7a89570..44abc85f105 100644 --- a/apps/admin_audit/appinfo/info.xml +++ b/apps/admin_audit/appinfo/info.xml @@ -5,10 +5,10 @@ <description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description> <licence>AGPL</licence> <author>Nextcloud</author> - <version>1.3.0</version> + <version>1.4.0</version> <namespace>AdminAudit</namespace> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <types> <logging/> diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml index 6fcfa4bd399..61a23cf65f8 100644 --- a/apps/comments/appinfo/info.xml +++ b/apps/comments/appinfo/info.xml @@ -7,9 +7,9 @@ <author>Arthur Schiwon</author> <author>Vincent Petry</author> <default_enable/> - <version>1.3.0</version> + <version>1.4.0</version> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <types> <logging/> diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 25a0d542e85..7115cacfef2 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,7 +5,7 @@ <description>WebDAV endpoint</description> <licence>AGPL</licence> <author>owncloud.org</author> - <version>1.4.6</version> + <version>1.5.0</version> <default_enable/> <types> <filesystem/> @@ -15,7 +15,7 @@ <webdav>appinfo/v1/publicwebdav.php</webdav> </public> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <repair-steps> <post-migration> diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index f35a87aa4f2..5744e5d2d66 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -19,13 +19,13 @@ <user>user-encryption</user> <admin>admin-encryption</admin> </documentation> - <version>2.0.0</version> + <version>2.1.0</version> <types> <filesystem/> </types> <dependencies> <lib>openssl</lib> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <settings> <admin>OCA\Encryption\Settings\Admin</admin> diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml index ce2e2286be3..ac5e3f45e95 100644 --- a/apps/federatedfilesharing/appinfo/info.xml +++ b/apps/federatedfilesharing/appinfo/info.xml @@ -6,11 +6,11 @@ <licence>AGPL</licence> <author>Bjoern Schiessle</author> <author>Roeland Jago Douma</author> - <version>1.3.1</version> + <version>1.4.0</version> <namespace>FederatedFileSharing</namespace> <category>other</category> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <settings> <admin>OCA\FederatedFileSharing\Settings\Admin</admin> diff --git a/apps/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php index aca6c3d26c1..d6f3f8fe5da 100644 --- a/apps/federatedfilesharing/tests/TokenHandlerTest.php +++ b/apps/federatedfilesharing/tests/TokenHandlerTest.php @@ -55,9 +55,9 @@ class TokenHandlerTest extends \Test\TestCase { $this->expectedTokenLength, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS ) - ->willReturn(true); + ->willReturn('mytoken'); - $this->assertTrue($this->tokenHandler->generateToken()); + $this->assertSame('mytoken', $this->tokenHandler->generateToken()); } diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index e2211394e1d..c7fc2f2431a 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -5,11 +5,11 @@ <description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description> <licence>AGPL</licence> <author>Bjoern Schiessle</author> - <version>1.3.0</version> + <version>1.4.0</version> <namespace>Federation</namespace> <category>other</category> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <default_enable/> <types> diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index c4b9e18ed05..1faf2c80adc 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -7,12 +7,12 @@ <author>Robin Appelman</author> <author>Vincent Petry</author> <default_enable/> - <version>1.8.0</version> + <version>1.9.0</version> <types> <filesystem/> </types> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <documentation> <user>user-files</user> diff --git a/apps/files/l10n/nb.js b/apps/files/l10n/nb.js index 45b9027f782..6e494a2ada8 100644 --- a/apps/files/l10n/nb.js +++ b/apps/files/l10n/nb.js @@ -66,6 +66,7 @@ OC.L10N.register( "{used} used" : "{used} brukt", "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.", "File name cannot be empty." : "Filnavn kan ikke være tomt.", + "\"/\" is not allowed inside a file name." : "\"/\" tillates ikke i et filnavn.", "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!", "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", diff --git a/apps/files/l10n/nb.json b/apps/files/l10n/nb.json index 0328ceb283a..387dc77b0d7 100644 --- a/apps/files/l10n/nb.json +++ b/apps/files/l10n/nb.json @@ -64,6 +64,7 @@ "{used} used" : "{used} brukt", "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.", "File name cannot be empty." : "Filnavn kan ikke være tomt.", + "\"/\" is not allowed inside a file name." : "\"/\" tillates ikke i et filnavn.", "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!", "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index 27409242c63..a924c32ba25 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -14,7 +14,7 @@ External storage can be configured using the GUI or at the command line. This se <documentation> <admin>admin-external-storage</admin> </documentation> - <version>1.4.1</version> + <version>1.5.0</version> <types> <filesystem/> </types> @@ -23,7 +23,7 @@ External storage can be configured using the GUI or at the command line. This se <namespace>Files_External</namespace> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <settings> diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index dee98fd65c6..596ad1f267b 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -75,6 +75,7 @@ OC.L10N.register( "Region" : "Région", "Enable SSL" : "Activer SSL", "Enable Path Style" : "Accès par path", + "Legacy (v2) authentication" : "Authentification héritée (v2)", "WebDAV" : "WebDAV", "URL" : "URL", "Remote subfolder" : "Sous-dossier distant", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index d1834c87a23..c5005b229b7 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -73,6 +73,7 @@ "Region" : "Région", "Enable SSL" : "Activer SSL", "Enable Path Style" : "Accès par path", + "Legacy (v2) authentication" : "Authentification héritée (v2)", "WebDAV" : "WebDAV", "URL" : "URL", "Remote subfolder" : "Sous-dossier distant", diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 13960dde684..ae04daf4f31 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -361,7 +361,7 @@ class OC_Mount_Config { */ private static function encryptPassword($password) { $cipher = self::getCipher(); - $iv = \OCP\Util::generateRandomBytes(16); + $iv = \OC::$server->getSecureRandom()->generate(16); $cipher->setIV($iv); return base64_encode($iv . $cipher->encrypt($password)); } diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index e98d29aeb8a..326bd49e9bc 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -11,12 +11,12 @@ Turning the feature off removes shared files and folders on the server for all s <author>Michael Gapczynski</author> <author>Bjoern Schiessle</author> <default_enable/> - <version>1.5.0</version> + <version>1.6.0</version> <types> <filesystem/> </types> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <public> <files>public.php</files> diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index a941e4afdc1..305906a5446 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -10,13 +10,13 @@ To prevent a user from running out of disk space, the Deleted files app will not <licence>AGPL</licence> <author>Bjoern Schiessle</author> <default_enable/> - <version>1.3.0</version> + <version>1.4.0</version> <types> <filesystem/> </types> <namespace>Files_Trashbin</namespace> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <documentation> <user>user-trashbin</user> diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index cb7d5d07d33..511b1713cb1 100644 --- a/apps/files_versions/appinfo/info.xml +++ b/apps/files_versions/appinfo/info.xml @@ -9,13 +9,13 @@ This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions. In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation. </description> - <version>1.6.0</version> + <version>1.7.0</version> <types> <filesystem/> </types> <namespace>Files_Versions</namespace> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <documentation> <user>user-versions</user> diff --git a/apps/lookup_server_connector/appinfo/info.xml b/apps/lookup_server_connector/appinfo/info.xml index 19b6587a14a..31fc4fe8e5f 100644 --- a/apps/lookup_server_connector/appinfo/info.xml +++ b/apps/lookup_server_connector/appinfo/info.xml @@ -6,10 +6,10 @@ <licence>AGPL</licence> <author>Bjoern Schiessle</author> <namespace>LookupServerConnector</namespace> - <version>1.1.0</version> + <version>1.2.0</version> <category>other</category> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <default_enable/> <types> diff --git a/apps/oauth2/appinfo/info.xml b/apps/oauth2/appinfo/info.xml index ccddc9a8f71..0bbad31dab3 100644 --- a/apps/oauth2/appinfo/info.xml +++ b/apps/oauth2/appinfo/info.xml @@ -6,13 +6,13 @@ <licence>agpl</licence> <author>Lukas Reschke</author> <namespace>OAuth2</namespace> - <version>1.1.0</version> + <version>1.2.0</version> <default_enable/> <types> <authentication/> </types> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <settings> diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index 54c77ac2a1e..849e74432f0 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/apps/provisioning_api/appinfo/info.xml @@ -17,12 +17,12 @@ <documentation> <admin>admin-provisioning-api</admin> </documentation> - <version>1.3.0</version> + <version>1.4.0</version> <namespace>Provisioning_API</namespace> <types> <prevent_group_restriction/> </types> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> </info> diff --git a/apps/sharebymail/appinfo/info.xml b/apps/sharebymail/appinfo/info.xml index b64573d59a0..f1cd70a66b3 100644 --- a/apps/sharebymail/appinfo/info.xml +++ b/apps/sharebymail/appinfo/info.xml @@ -5,11 +5,11 @@ <description>Share provider which allows you to share files by mail</description> <licence>AGPL</licence> <author>Bjoern Schiessle</author> - <version>1.3.0</version> + <version>1.4.0</version> <namespace>ShareByMail</namespace> <category>other</category> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <default_enable/> diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml index cdefb3dcf29..e46daf4b042 100644 --- a/apps/systemtags/appinfo/info.xml +++ b/apps/systemtags/appinfo/info.xml @@ -8,9 +8,9 @@ <author>Vincent Petry</author> <author>Joas Schilling</author> <default_enable/> - <version>1.3.0</version> + <version>1.4.0</version> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <namespace>SystemTags</namespace> <types> diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml index a0d3068d6bb..d0d350a0364 100644 --- a/apps/testing/appinfo/info.xml +++ b/apps/testing/appinfo/info.xml @@ -5,9 +5,9 @@ <description>This app is only for testing! It is dangerous to have it enabled in a live instance</description> <licence>AGPL</licence> <author>Joas Schilling</author> - <version>1.3.0</version> + <version>1.4.0</version> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <types> <authentication/> diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml index 883dfbbb2ec..11a8d2f73f7 100644 --- a/apps/theming/appinfo/info.xml +++ b/apps/theming/appinfo/info.xml @@ -5,12 +5,12 @@ <description>Adjust the Nextcloud theme</description> <licence>AGPL</licence> <author>Nextcloud</author> - <version>1.4.1</version> + <version>1.5.0</version> <namespace>Theming</namespace> <category>other</category> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <types> diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml index 18728a7047a..f2581de63e0 100644 --- a/apps/twofactor_backupcodes/appinfo/info.xml +++ b/apps/twofactor_backupcodes/appinfo/info.xml @@ -5,7 +5,7 @@ <description>A two-factor auth backup codes provider</description> <licence>agpl</licence> <author>Christoph Wurst</author> - <version>1.2.3</version> + <version>1.3.0</version> <namespace>TwoFactorBackupCodes</namespace> <category>other</category> @@ -14,7 +14,7 @@ </two-factor-providers> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <activity> diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml index aee0692ab47..5dc0889bb9d 100644 --- a/apps/updatenotification/appinfo/info.xml +++ b/apps/updatenotification/appinfo/info.xml @@ -5,11 +5,11 @@ <description>Displays update notifications for Nextcloud and provides the SSO for the updater.</description> <licence>AGPL</licence> <author>Lukas Reschke</author> - <version>1.3.0</version> + <version>1.4.0</version> <namespace>UpdateNotification</namespace> <default_enable/> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <background-jobs> diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index c303ef79283..dbf9a736899 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -10,7 +10,7 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc <licence>AGPL</licence> <author>Dominik Schmidt</author> <author>Arthur Schiwon</author> - <version>1.3.1</version> + <version>1.4.0</version> <types> <authentication/> </types> @@ -19,7 +19,7 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc </documentation> <dependencies> <lib>ldap</lib> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <namespace>User_LDAP</namespace> diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index e758bc9bd02..03fd73f261f 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -150,7 +150,7 @@ class Group_LDAPTest extends \Test\TestCase { $access->expects($this->any()) ->method('dn2username') ->will($this->returnCallback(function() { - return 'foobar' . \OCP\Util::generateRandomBytes(7); + return 'foobar' . \OC::$server->getSecureRandom()->generate(7); })); $groupBackend = new GroupLDAP($access,$pluginManager); diff --git a/apps/workflowengine/appinfo/info.xml b/apps/workflowengine/appinfo/info.xml index 80a277f375d..5d51333f750 100644 --- a/apps/workflowengine/appinfo/info.xml +++ b/apps/workflowengine/appinfo/info.xml @@ -5,7 +5,7 @@ <description></description> <licence>AGPL</licence> <author>Morris Jobke</author> - <version>1.3.0</version> + <version>1.4.0</version> <namespace>WorkflowEngine</namespace> <category>other</category> @@ -18,7 +18,7 @@ </types> <dependencies> - <nextcloud min-version="13" max-version="13" /> + <nextcloud min-version="14" max-version="14" /> </dependencies> <settings> diff --git a/lib/private/App/CodeChecker/DatabaseSchemaChecker.php b/lib/private/App/CodeChecker/DatabaseSchemaChecker.php index 1255dec25c1..e407430e974 100644 --- a/lib/private/App/CodeChecker/DatabaseSchemaChecker.php +++ b/lib/private/App/CodeChecker/DatabaseSchemaChecker.php @@ -49,37 +49,37 @@ class DatabaseSchemaChecker { foreach ($xml->table as $table) { // Table names - if (strpos($table->name, '*dbprefix*') !== 0) { - $errors[] = 'Database schema error: name of table ' . $table->name . ' does not start with *dbprefix*'; + if (strpos((string)$table->name, '*dbprefix*') !== 0) { + $errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*'; } - $tableName = substr($table->name, strlen('*dbprefix*')); + $tableName = substr((string)$table->name, strlen('*dbprefix*')); if (strpos($tableName, '*dbprefix*') !== false) { - $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . $table->name; + $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name; } if (strlen($tableName) > 27) { - $errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; + $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; } $hasAutoIncrement = false; // Column names foreach ($table->declaration->field as $column) { - if (strpos($column->name, '*dbprefix*') !== false) { - $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . $column->name . ' on table ' . $table->name; + if (strpos((string)$column->name, '*dbprefix*') !== false) { + $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name; } - if (strlen($column->name) > 30) { - $errors[] = 'Database schema error: Name of column ' . $column->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed'; + if (strlen((string)$column->name) > 30) { + $errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed'; } if ($column->autoincrement) { if ($hasAutoIncrement) { - $errors[] = 'Database schema error: Table ' . $table->name . ' has multiple autoincrement columns'; + $errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns'; } if (strlen($tableName) > 21) { - $errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; + $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; } $hasAutoIncrement = true; @@ -88,14 +88,14 @@ class DatabaseSchemaChecker { // Index names foreach ($table->declaration->index as $index) { - $hasPrefix = strpos($index->name, '*dbprefix*'); + $hasPrefix = strpos((string)$index->name, '*dbprefix*'); if ($hasPrefix !== false && $hasPrefix !== 0) { - $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . $index->name . ' on table ' . $table->name; + $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name; } - $indexName = $hasPrefix === 0 ? substr($index->name, strlen('*dbprefix*')) : $index->name; + $indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name; if (strlen($indexName) > 27) { - $errors[] = 'Database schema error: Name of index ' . $index->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed'; + $errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed'; } } } diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 612728d1356..47566e0381c 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -229,8 +229,8 @@ class DIContainer extends SimpleContainer implements IAppContainer { $server->getURLGenerator(), $server->getLogger(), $c['AppName'], - $app->isLoggedIn(), - $app->isAdminUser(), + $server->getUserSession()->isLoggedIn(), + $server->getGroupManager()->isAdmin($this->getUserId()), $server->getContentSecurityPolicyManager(), $server->getCsrfTokenManager(), $server->getContentSecurityPolicyNonceManager(), diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index b3db9231972..5b114bffac2 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -20,8 +20,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OC; +declare(strict_types=1); + +namespace OC; use OCP\AppFramework\QueryException; use OCP\Capabilities\ICapability; @@ -47,7 +49,7 @@ class CapabilitiesManager { * @throws \InvalidArgumentException * @return array */ - public function getCapabilities($public = false) { + public function getCapabilities(bool $public = false) : array { $capabilities = []; foreach($this->capabilities as $capability) { try { @@ -78,6 +80,6 @@ class CapabilitiesManager { * @param \Closure $callable */ public function registerCapability(\Closure $callable) { - array_push($this->capabilities, $callable); + $this->capabilities[] = $callable; } } diff --git a/lib/private/Search.php b/lib/private/Search.php index 17958c8e08e..0cfdf24ac97 100644 --- a/lib/private/Search.php +++ b/lib/private/Search.php @@ -41,17 +41,6 @@ class Search implements ISearch { * Search all providers for $query * @param string $query * @param string[] $inApps optionally limit results to the given apps - * @return array An array of OC\Search\Result's - */ - public function search($query, array $inApps = array()) { - // old apps might assume they get all results, so we set size 0 - return $this->searchPaged($query, $inApps, 1, 0); - } - - /** - * Search all providers for $query - * @param string $query - * @param string[] $inApps optionally limit results to the given apps * @param int $page pages start at page 1 * @param int $size, 0 = all * @return array An array of OC\Search\Result's diff --git a/lib/private/Security/SecureRandom.php b/lib/private/Security/SecureRandom.php index 5bd909ea002..75d9d02a1d3 100644 --- a/lib/private/Security/SecureRandom.php +++ b/lib/private/Security/SecureRandom.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. * @@ -70,9 +71,9 @@ class SecureRandom implements ISecureRandom { * specified all valid base64 characters are used. * @return string */ - public function generate($length, - $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') { - $maxCharIndex = strlen($characters) - 1; + public function generate(int $length, + string $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'): string { + $maxCharIndex = \strlen($characters) - 1; $randomString = ''; while($length > 0) { diff --git a/lib/public/AppFramework/IAppContainer.php b/lib/public/AppFramework/IAppContainer.php index 4aac6085d63..2fa0bcdd5aa 100644 --- a/lib/public/AppFramework/IAppContainer.php +++ b/lib/public/AppFramework/IAppContainer.php @@ -45,13 +45,6 @@ interface IAppContainer extends IContainer { public function getAppName(); /** - * @deprecated 8.0.0 implements only deprecated methods - * @return IApi - * @since 6.0.0 - */ - public function getCoreApi(); - - /** * @return \OCP\IServerContainer * @since 6.0.0 */ @@ -65,29 +58,6 @@ interface IAppContainer extends IContainer { public function registerMiddleWare($middleWare); /** - * @deprecated 8.0.0 use IUserSession->isLoggedIn() - * @return boolean - * @since 6.0.0 - */ - public function isLoggedIn(); - - /** - * @deprecated 8.0.0 use IGroupManager->isAdmin($userId) - * @return boolean - * @since 6.0.0 - */ - public function isAdminUser(); - - /** - * @deprecated 8.0.0 use the ILogger instead - * @param string $message - * @param string $level - * @return mixed - * @since 6.0.0 - */ - public function log($message, $level); - - /** * Register a capability * * @param string $serviceName e.g. 'OCA\Files\Capabilities' diff --git a/lib/public/Constants.php b/lib/public/Constants.php index ca4b5fa473f..48cd5765531 100644 --- a/lib/public/Constants.php +++ b/lib/public/Constants.php @@ -30,27 +30,6 @@ namespace OCP; -/** @deprecated 8.0.0 Use \OCP\Constants::PERMISSION_CREATE instead */ -const PERMISSION_CREATE = 4; - -/** @deprecated 8.0.0 Use \OCP\Constants::PERMISSION_READ instead */ -const PERMISSION_READ = 1; - -/** @deprecated 8.0.0 Use \OCP\Constants::PERMISSION_UPDATE instead */ -const PERMISSION_UPDATE = 2; - -/** @deprecated 8.0.0 Use \OCP\Constants::PERMISSION_DELETE instead */ -const PERMISSION_DELETE = 8; - -/** @deprecated 8.0.0 Use \OCP\Constants::PERMISSION_SHARE instead */ -const PERMISSION_SHARE = 16; - -/** @deprecated 8.0.0 Use \OCP\Constants::PERMISSION_ALL instead */ -const PERMISSION_ALL = 31; - -/** @deprecated 8.0.0 Use \OCP\Constants::FILENAME_INVALID_CHARS instead */ -const FILENAME_INVALID_CHARS = "\\/<>:\"|?*\n"; - /** * Class Constants * diff --git a/lib/public/ISearch.php b/lib/public/ISearch.php index 93dc3b9c1f2..001c847a9e3 100644 --- a/lib/public/ISearch.php +++ b/lib/public/ISearch.php @@ -37,16 +37,6 @@ interface ISearch { * Search all providers for $query * @param string $query * @param string[] $inApps optionally limit results to the given apps - * @return array An array of OCP\Search\Result's - * @deprecated 8.0.0 use searchPaged() with page and size - * @since 7.0.0 - parameter $inApps was added in 8.0.0 - */ - public function search($query, array $inApps = array()); - - /** - * Search all providers for $query - * @param string $query - * @param string[] $inApps optionally limit results to the given apps * @param int $page pages start at page 1 * @param int $size * @return array An array of OCP\Search\Result's diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 76e207fbbd8..235b3033c44 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. * @@ -87,7 +88,7 @@ interface ISecureRandom { * @return string * @since 8.0.0 */ - public function generate($length, - $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'); + public function generate(int $length, + string $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'): string; } diff --git a/lib/public/Util.php b/lib/public/Util.php index 5127beaf505..2fb6bdf491d 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -245,21 +245,6 @@ class Util { } /** - * formats a timestamp in the "right" way - * @param int $timestamp $timestamp - * @param bool $dateOnly option to omit time from the result - * @param DateTimeZone|string $timeZone where the given timestamp shall be converted to - * @return string timestamp - * - * @deprecated 8.0.0 Use \OC::$server->query('DateTimeFormatter') instead - * @since 4.0.0 - * @suppress PhanDeprecatedFunction - */ - public static function formatDate($timestamp, $dateOnly=false, $timeZone = null) { - return \OC_Util::formatDate($timestamp, $dateOnly, $timeZone); - } - - /** * check if some encrypted files are stored * @return bool * @@ -657,17 +642,6 @@ class Util { } /** - * Generates a cryptographic secure pseudo-random string - * @param int $length of the random string - * @return string - * @deprecated 8.0.0 Use \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($length); instead - * @since 7.0.0 - */ - public static function generateRandomBytes($length = 30) { - return \OC::$server->getSecureRandom()->generate($length, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); - } - - /** * Compare two strings to provide a natural sort * @param string $a first string to compare * @param string $b second string to compare diff --git a/settings/l10n/nb.js b/settings/l10n/nb.js index e889a966092..4e77988bbf4 100644 --- a/settings/l10n/nb.js +++ b/settings/l10n/nb.js @@ -109,7 +109,9 @@ OC.L10N.register( "Could not upgrade app" : "Kunne ikke oppgradere appen", "Updated" : "Oppdatert", "Removing …" : "Fjerner…", + "Could not remove app" : "Kunne ikke fjerne program", "Remove" : "Fjern", + "App upgrade" : "Programoppgradering", "Approved" : "Godkjent", "Experimental" : "Eksperimentell", "No apps found for {query}" : "Ingen programmer funnet for {query}", diff --git a/settings/l10n/nb.json b/settings/l10n/nb.json index b95a39680b8..ef6fe72a81f 100644 --- a/settings/l10n/nb.json +++ b/settings/l10n/nb.json @@ -107,7 +107,9 @@ "Could not upgrade app" : "Kunne ikke oppgradere appen", "Updated" : "Oppdatert", "Removing …" : "Fjerner…", + "Could not remove app" : "Kunne ikke fjerne program", "Remove" : "Fjern", + "App upgrade" : "Programoppgradering", "Approved" : "Godkjent", "Experimental" : "Eksperimentell", "No apps found for {query}" : "Ingen programmer funnet for {query}", diff --git a/version.php b/version.php index 6ba86635dd2..04ca2acd0a4 100644 --- a/version.php +++ b/version.php @@ -29,15 +29,15 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(13, 0, 0, 10); +$OC_Version = array(14, 0, 0, 0); // The human readable string -$OC_VersionString = '13.0.0 RC 1'; +$OC_VersionString = '14.0.0 alpha'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ - '12.0' => true, '13.0' => true, + '14.0' => true, ], 'owncloud' => [ ], |