Merge pull request #1152 from owncloud/code-style-4

Implement owncloud/coding-standard 4
owncloud · Nov 17, 2022 · 7be75ff · 7be75ff
2 parents a80b358 + e0ce712
commit 7be75ff
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 35 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,11 +1,8 @@
 <?php
+$finder = PhpCsFixer\Finder::create()
+	->notPath('templates/html.notification.php')
+	->in(__DIR__);
 
 $config = new OC\CodingStandard\Config();
-
-$config
-    ->setUsingCache(true)
-    ->getFinder()
-    ->in(__DIR__);
-
+$config->setFinder($finder);
 return $config;
-
diff --git a/appinfo/Migrations/Version20161122092159.php b/appinfo/Migrations/Version20161122092159.php
@@ -8,7 +8,6 @@
 use OCP\Migration\ISchemaMigration;
 
 class Version20161122092159 implements ISchemaMigration {
-
 	/**
 	 * @param Schema $schema
 	 * @param array $options

diff --git a/appinfo/Migrations/Version20170724182159.php b/appinfo/Migrations/Version20170724182159.php
@@ -11,7 +11,6 @@
  */
 
 class Version20170724182159 implements ISchemaMigration {
-
 	/**
 	 * @param Schema $schema
 	 * @param array $options

diff --git a/appinfo/Migrations/Version20181022150134.php b/appinfo/Migrations/Version20181022150134.php
@@ -34,7 +34,6 @@
  *
  */
 class Version20181022150134 implements ISqlMigration {
-
 	/**
 	 * @param Schema $schema
 	 * @param array $options

diff --git a/lib/Consumer.php b/lib/Consumer.php
@@ -28,7 +28,6 @@
 use OCP\L10N\IFactory;
 
 class Consumer implements IConsumer {
-
 	/** @var Data */
 	protected $data;
 

diff --git a/lib/Controller/Activities.php b/lib/Controller/Activities.php
@@ -29,7 +29,6 @@
 use OCP\IRequest;
 
 class Activities extends Controller {
-
 	/** @var \OCA\Activity\Data */
 	protected $data;
 

diff --git a/lib/Controller/EndPoint.php b/lib/Controller/EndPoint.php
@@ -27,7 +27,6 @@
 use OCP\IRequest;
 
 class EndPoint extends Controller {
-
 	/** @var OCSEndPoint */
 	protected $ocsEndPoint;
 

diff --git a/lib/Controller/OCSEndPoint.php b/lib/Controller/OCSEndPoint.php
@@ -37,7 +37,6 @@
 use OCP\IUserSession;
 
 class OCSEndPoint {
-
 	/** @var string */
 	protected $filter;
 

diff --git a/lib/FilesHooksStatic.php b/lib/FilesHooksStatic.php
@@ -28,7 +28,6 @@
  * The class to handle the filesystem hooks
  */
 class FilesHooksStatic {
-
 	/**
 	 * @var Appinfo\Application
 	 */

diff --git a/lib/Formatter/GroupFormatter.php b/lib/Formatter/GroupFormatter.php
@@ -26,7 +26,6 @@
 use OCP\Util;
 
 class GroupFormatter implements IFormatter {
-
 	/** @var IGroupManager  */
 	protected $groupManager;
 

diff --git a/lib/Formatter/UrlFormatter.php b/lib/Formatter/UrlFormatter.php
@@ -25,7 +25,6 @@
 use OCP\Util;
 
 class UrlFormatter implements IFormatter {
-
 	/**
 	 * Format a list of url parameters into an html a-tag. The parameters have to be provided as json encoded data, i.e. a string.
 	 * Allowed values are:

diff --git a/lib/Hooks.php b/lib/Hooks.php
@@ -30,7 +30,6 @@
  * Handles the stream and mail queue of a user when he is being deleted
  */
 class Hooks {
-
 	/**
 	 * Delete remaining activities and emails when a user is deleted
 	 *

diff --git a/lib/HtmlTextParser.php b/lib/HtmlTextParser.php
@@ -25,7 +25,6 @@
 use OCP\IURLGenerator;
 
 class HtmlTextParser extends PlainTextParser {
-
 	/**
 	 * @var IURLGenerator
 	 */

diff --git a/lib/Parameter/IParameter.php b/lib/Parameter/IParameter.php
@@ -22,7 +22,6 @@
 namespace OCA\Activity\Parameter;
 
 interface IParameter {
-
 	/**
 	 * A value that is used to check, if the parameter is already in a Collection
 	 * @return mixed

diff --git a/lib/PersonalPanel.php b/lib/PersonalPanel.php
@@ -5,7 +5,6 @@
 use OCP\Settings\ISettings;
 
 class PersonalPanel implements ISettings {
-
 	/** @var AppInfo\Application  */
 	protected $app;
 

diff --git a/lib/PlainTextParser.php b/lib/PlainTextParser.php
@@ -24,7 +24,6 @@
 use OCP\IL10N;
 
 class PlainTextParser {
-
 	/** @var IL10N */
 	protected $l;
 

diff --git a/lib/ViewInfoCache.php b/lib/ViewInfoCache.php
@@ -25,7 +25,6 @@
 use OCP\Files\NotFoundException;
 
 class ViewInfoCache {
-
 	/** @var array */
 	protected $cachePath;
 	/** @var array */

diff --git a/templates/stream.app.navigation.php b/templates/stream.app.navigation.php
@@ -8,22 +8,22 @@
 ?>
 <div id="app-navigation">
 	<?php foreach ($_['navigations'] as $navigationGroup => $navigationEntries) {
-	?>
+		?>
 		<?php if ($navigationGroup !== 'apps'): ?><ul><?php endif; ?>
 
 		<?php foreach ($navigationEntries as $navigation) {
-		?>
+			?>
 		<li<?php if ($_['activeNavigation'] === $navigation['id']): ?> class="active"<?php endif; ?>>
 			<a data-navigation="<?php p($navigation['id']) ?>" href="<?php p($navigation['url']) ?>">
 				<?php p($navigation['name']) ?>
 			</a>
 		</li>
 		<?php
-	} ?>
+		} ?>
 
 		<?php if ($navigationGroup !== 'top'): ?></ul><?php endif; ?>
 	<?php
-} ?>
+	} ?>
 
 	<div id="app-settings">
 		<div id="app-settings-header">

diff --git a/tests/acceptance/features/lib/ActivityPage.php b/tests/acceptance/features/lib/ActivityPage.php
@@ -35,7 +35,6 @@
  * activity app gets an overhaul, it might require us to have two separate pages.
  */
 class ActivityPage extends OwncloudPage {
-
 	/**
 	 *
 	 * @var string $path

diff --git a/tests/unit/Formatter/BaseFormatterTest.php b/tests/unit/Formatter/BaseFormatterTest.php
@@ -26,7 +26,6 @@
 use OCA\Activity\Tests\Unit\TestCase;
 
 class BaseFormatterTest extends TestCase {
-
 	/**
 	 * @param array $methods
 	 * @return IFormatter|\PHPUnit\Framework\MockObject\MockObject

diff --git a/tests/unit/Formatter/GroupFormatterTest.php b/tests/unit/Formatter/GroupFormatterTest.php
@@ -28,7 +28,6 @@
 use OCP\IGroupManager;
 
 class GroupFormatterTest extends TestCase {
-
 	/** @var  \OCP\IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
 	protected $groupManager;
 

diff --git a/tests/unit/Formatter/UrlFormatterTest.php b/tests/unit/Formatter/UrlFormatterTest.php
@@ -27,7 +27,6 @@
 use OCP\Activity\IEvent;
 
 class UrlFormatterTest extends TestCase {
-
 	/**
 	 * @param array $methods
 	 * @return IFormatter|\PHPUnit\Framework\MockObject\MockObject

diff --git a/tests/unit/Formatter/UserFormatterTest.php b/tests/unit/Formatter/UserFormatterTest.php
@@ -26,7 +26,6 @@
 use OCA\Activity\Tests\Unit\TestCase;
 
 class UserFormatterTest extends TestCase {
-
 	/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */
 	protected $userManager;
 

diff --git a/tests/unit/MailQueueHandlerTest.php b/tests/unit/MailQueueHandlerTest.php
@@ -32,7 +32,6 @@
  * @package OCA\Activity\Tests
  */
 class MailQueueHandlerTest extends TestCase {
-
 	/** @var MailQueueHandler */
 	protected $mailQueueHandler;
 

diff --git a/tests/unit/Parsers/HtmlTextParserTest.php b/tests/unit/Parsers/HtmlTextParserTest.php
@@ -8,7 +8,6 @@
 use Test\TestCase;
 
 class HtmlTextParserTest extends TestCase {
-
 	/**
 	 * @dataProvider providesMessages
 	 * @param string $expected

diff --git a/vendor-bin/owncloud-codestyle/composer.json b/vendor-bin/owncloud-codestyle/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "owncloud/coding-standard": "^3.0"
+        "owncloud/coding-standard": "^4.0"
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
      */
     class Version20170724182159 implements ISchemaMigration {
     	/**
     	 * @param Schema $schema
     	 * @param array $options
@@ Expand Down @@