Passed
Push — master ( da9ad9...c724eb )
by Roeland
13:33 queued 01:55
created
lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
  */
43 43
 class StrictEvalContentSecurityPolicy extends ContentSecurityPolicy {
44 44
 
45
-	/**
46
-	 * @since 14.0.0
47
-	 */
48
-	public function __construct() {
49
-		$this->evalScriptAllowed = false;
50
-	}
45
+    /**
46
+     * @since 14.0.0
47
+     */
48
+    public function __construct() {
49
+        $this->evalScriptAllowed = false;
50
+    }
51 51
 }
Please login to merge, or discard this patch.
apps/dav/lib/Migration/Version1006Date20180619154313.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -11,61 +11,61 @@
 block discarded – undo
11 11
  */
12 12
 class Version1006Date20180619154313 extends SimpleMigrationStep {
13 13
 
14
-	/**
15
-	 * @param IOutput $output
16
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
17
-	 * @param array $options
18
-	 * @return null|ISchemaWrapper
19
-	 * @since 13.0.0
20
-	 */
21
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
22
-		/** @var ISchemaWrapper $schema */
23
-		$schema = $schemaClosure();
14
+    /**
15
+     * @param IOutput $output
16
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
17
+     * @param array $options
18
+     * @return null|ISchemaWrapper
19
+     * @since 13.0.0
20
+     */
21
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
22
+        /** @var ISchemaWrapper $schema */
23
+        $schema = $schemaClosure();
24 24
 
25
-		if (!$schema->hasTable('calendar_invitations')) {
26
-			$table = $schema->createTable('calendar_invitations');
25
+        if (!$schema->hasTable('calendar_invitations')) {
26
+            $table = $schema->createTable('calendar_invitations');
27 27
 
28
-			$table->addColumn('id', Type::BIGINT, [
29
-				'autoincrement' => true,
30
-				'notnull' => true,
31
-				'length' => 11,
32
-				'unsigned' => true,
33
-			]);
34
-			$table->addColumn('uid', Type::STRING, [
35
-				'notnull' => true,
36
-				'length' => 255,
37
-			]);
38
-			$table->addColumn('recurrenceid', Type::STRING, [
39
-				'notnull' => false,
40
-				'length' => 255,
41
-			]);
42
-			$table->addColumn('attendee', Type::STRING, [
43
-				'notnull' => true,
44
-				'length' => 255,
45
-			]);
46
-			$table->addColumn('organizer', Type::STRING, [
47
-				'notnull' => true,
48
-				'length' => 255,
49
-			]);
50
-			$table->addColumn('sequence', Type::BIGINT, [
51
-				'notnull' => false,
52
-				'length' => 11,
53
-				'unsigned' => true,
54
-			]);
55
-			$table->addColumn('token', Type::STRING, [
56
-				'notnull' => true,
57
-				'length' => 60,
58
-			]);
59
-			$table->addColumn('expiration', Type::BIGINT, [
60
-				'notnull' => true,
61
-				'length' => 11,
62
-				'unsigned' => true,
63
-			]);
28
+            $table->addColumn('id', Type::BIGINT, [
29
+                'autoincrement' => true,
30
+                'notnull' => true,
31
+                'length' => 11,
32
+                'unsigned' => true,
33
+            ]);
34
+            $table->addColumn('uid', Type::STRING, [
35
+                'notnull' => true,
36
+                'length' => 255,
37
+            ]);
38
+            $table->addColumn('recurrenceid', Type::STRING, [
39
+                'notnull' => false,
40
+                'length' => 255,
41
+            ]);
42
+            $table->addColumn('attendee', Type::STRING, [
43
+                'notnull' => true,
44
+                'length' => 255,
45
+            ]);
46
+            $table->addColumn('organizer', Type::STRING, [
47
+                'notnull' => true,
48
+                'length' => 255,
49
+            ]);
50
+            $table->addColumn('sequence', Type::BIGINT, [
51
+                'notnull' => false,
52
+                'length' => 11,
53
+                'unsigned' => true,
54
+            ]);
55
+            $table->addColumn('token', Type::STRING, [
56
+                'notnull' => true,
57
+                'length' => 60,
58
+            ]);
59
+            $table->addColumn('expiration', Type::BIGINT, [
60
+                'notnull' => true,
61
+                'length' => 11,
62
+                'unsigned' => true,
63
+            ]);
64 64
 
65
-			$table->setPrimaryKey(['id']);
66
-			$table->addIndex(['token'], 'calendar_invitation_tokens');
65
+            $table->setPrimaryKey(['id']);
66
+            $table->addIndex(['token'], 'calendar_invitation_tokens');
67 67
 
68
-			return $schema;
69
-		}
70
-	}
68
+            return $schema;
69
+        }
70
+    }
71 71
 }
Please login to merge, or discard this patch.
apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -30,24 +30,24 @@
 block discarded – undo
30 30
 
31 31
 class CleanupInvitationTokenJob extends TimedJob {
32 32
 
33
-	/** @var IDBConnection  */
34
-	private $db;
35
-
36
-	/** @var ITimeFactory */
37
-	private $timeFactory;
38
-
39
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
40
-		$this->db = $db;
41
-		$this->timeFactory = $timeFactory;
42
-
43
-		$this->setInterval(60 * 60 * 24);
44
-	}
45
-
46
-	public function run($argument) {
47
-		$query = $this->db->getQueryBuilder();
48
-		$query->delete('calendar_invitations')
49
-			->where($query->expr()->lt('expiration',
50
-				$query->createNamedParameter($this->timeFactory->getTime())))
51
-			->execute();
52
-	}
33
+    /** @var IDBConnection  */
34
+    private $db;
35
+
36
+    /** @var ITimeFactory */
37
+    private $timeFactory;
38
+
39
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
40
+        $this->db = $db;
41
+        $this->timeFactory = $timeFactory;
42
+
43
+        $this->setInterval(60 * 60 * 24);
44
+    }
45
+
46
+    public function run($argument) {
47
+        $query = $this->db->getQueryBuilder();
48
+        $query->delete('calendar_invitations')
49
+            ->where($query->expr()->lt('expiration',
50
+                $query->createNamedParameter($this->timeFactory->getTime())))
51
+            ->execute();
52
+    }
53 53
 }
Please login to merge, or discard this patch.
lib/public/L10N/ILanguageIterator.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -44,31 +44,31 @@
 block discarded – undo
44 44
  */
45 45
 interface ILanguageIterator extends \Iterator {
46 46
 
47
-	/**
48
-	 * Return the current element
49
-	 *
50
-	 * @since 14.0.0
51
-	 */
52
-	public function current(): string;
47
+    /**
48
+     * Return the current element
49
+     *
50
+     * @since 14.0.0
51
+     */
52
+    public function current(): string;
53 53
 
54
-	/**
55
-	 * Move forward to next element
56
-	 *
57
-	 * @since 14.0.0
58
-	 */
59
-	public function next();
54
+    /**
55
+     * Move forward to next element
56
+     *
57
+     * @since 14.0.0
58
+     */
59
+    public function next();
60 60
 
61
-	/**
62
-	 * Return the key of the current element
63
-	 *
64
-	 * @since 14.0.0
65
-	 */
66
-	public function key():int;
61
+    /**
62
+     * Return the key of the current element
63
+     *
64
+     * @since 14.0.0
65
+     */
66
+    public function key():int;
67 67
 
68
-	/**
69
-	 * Checks if current position is valid
70
-	 *
71
-	 * @since 14.0.0
72
-	 */
73
-	public function valid():bool;
68
+    /**
69
+     * Checks if current position is valid
70
+     *
71
+     * @since 14.0.0
72
+     */
73
+    public function valid():bool;
74 74
 }
Please login to merge, or discard this patch.
apps/files/appinfo/app.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -40,28 +40,28 @@
 block discarded – undo
40 40
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
41 41
 
42 42
 \OCA\Files\App::getNavigationManager()->add([
43
-	'id'      => 'files',
44
-	'appname' => 'files',
45
-	'script'  => 'list.php',
46
-	'order'   => 0,
47
-	'name'    => $l->t('All files')
43
+    'id'      => 'files',
44
+    'appname' => 'files',
45
+    'script'  => 'list.php',
46
+    'order'   => 0,
47
+    'name'    => $l->t('All files')
48 48
 ]);
49 49
 
50 50
 \OCA\Files\App::getNavigationManager()->add([
51
-	'id'      => 'recent',
52
-	'appname' => 'files',
53
-	'script'  => 'recentlist.php',
54
-	'order'   => 2,
55
-	'name'    => $l->t('Recent')
51
+    'id'      => 'recent',
52
+    'appname' => 'files',
53
+    'script'  => 'recentlist.php',
54
+    'order'   => 2,
55
+    'name'    => $l->t('Recent')
56 56
 ]);
57 57
 
58 58
 \OCA\Files\App::getNavigationManager()->add([
59
-	'id'            => 'favorites',
60
-	'appname'       => 'files',
61
-	'script'        => 'simplelist.php',
62
-	'order'         => 5,
63
-	'name'          => $l->t('Favorites'),
64
-	'expandedState' => 'show_Quick_Access'
59
+    'id'            => 'favorites',
60
+    'appname'       => 'files',
61
+    'script'        => 'simplelist.php',
62
+    'order'         => 5,
63
+    'name'          => $l->t('Favorites'),
64
+    'expandedState' => 'show_Quick_Access'
65 65
 ]);
66 66
 
67 67
 \OCP\Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
Please login to merge, or discard this patch.
apps/files/lib/Activity/Filter/FileChanges.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -30,72 +30,72 @@
 block discarded – undo
30 30
 
31 31
 class FileChanges implements IFilter {
32 32
 
33
-	/** @var IL10N */
34
-	protected $l;
33
+    /** @var IL10N */
34
+    protected $l;
35 35
 
36
-	/** @var IURLGenerator */
37
-	protected $url;
36
+    /** @var IURLGenerator */
37
+    protected $url;
38 38
 
39
-	/**
40
-	 * @param IL10N $l
41
-	 * @param IURLGenerator $url
42
-	 */
43
-	public function __construct(IL10N $l, IURLGenerator $url) {
44
-		$this->l = $l;
45
-		$this->url = $url;
46
-	}
39
+    /**
40
+     * @param IL10N $l
41
+     * @param IURLGenerator $url
42
+     */
43
+    public function __construct(IL10N $l, IURLGenerator $url) {
44
+        $this->l = $l;
45
+        $this->url = $url;
46
+    }
47 47
 
48
-	/**
49
-	 * @return string Lowercase a-z only identifier
50
-	 * @since 11.0.0
51
-	 */
52
-	public function getIdentifier() {
53
-		return 'files';
54
-	}
48
+    /**
49
+     * @return string Lowercase a-z only identifier
50
+     * @since 11.0.0
51
+     */
52
+    public function getIdentifier() {
53
+        return 'files';
54
+    }
55 55
 
56
-	/**
57
-	 * @return string A translated string
58
-	 * @since 11.0.0
59
-	 */
60
-	public function getName() {
61
-		return $this->l->t('File changes');
62
-	}
56
+    /**
57
+     * @return string A translated string
58
+     * @since 11.0.0
59
+     */
60
+    public function getName() {
61
+        return $this->l->t('File changes');
62
+    }
63 63
 
64
-	/**
65
-	 * @return int
66
-	 * @since 11.0.0
67
-	 */
68
-	public function getPriority() {
69
-		return 30;
70
-	}
64
+    /**
65
+     * @return int
66
+     * @since 11.0.0
67
+     */
68
+    public function getPriority() {
69
+        return 30;
70
+    }
71 71
 
72
-	/**
73
-	 * @return string Full URL to an icon, empty string when none is given
74
-	 * @since 11.0.0
75
-	 */
76
-	public function getIcon() {
77
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
78
-	}
72
+    /**
73
+     * @return string Full URL to an icon, empty string when none is given
74
+     * @since 11.0.0
75
+     */
76
+    public function getIcon() {
77
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
78
+    }
79 79
 
80
-	/**
81
-	 * @param string[] $types
82
-	 * @return string[] An array of allowed apps from which activities should be displayed
83
-	 * @since 11.0.0
84
-	 */
85
-	public function filterTypes(array $types) {
86
-		return array_intersect([
87
-			'file_created',
88
-			'file_changed',
89
-			'file_deleted',
90
-			'file_restored',
91
-		], $types);
92
-	}
80
+    /**
81
+     * @param string[] $types
82
+     * @return string[] An array of allowed apps from which activities should be displayed
83
+     * @since 11.0.0
84
+     */
85
+    public function filterTypes(array $types) {
86
+        return array_intersect([
87
+            'file_created',
88
+            'file_changed',
89
+            'file_deleted',
90
+            'file_restored',
91
+        ], $types);
92
+    }
93 93
 
94
-	/**
95
-	 * @return string[] An array of allowed apps from which activities should be displayed
96
-	 * @since 11.0.0
97
-	 */
98
-	public function allowedApps() {
99
-		return ['files'];
100
-	}
94
+    /**
95
+     * @return string[] An array of allowed apps from which activities should be displayed
96
+     * @since 11.0.0
97
+     */
98
+    public function allowedApps() {
99
+        return ['files'];
100
+    }
101 101
 }
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/Activity/Filter/Calendar.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -30,65 +30,65 @@
 block discarded – undo
30 30
 
31 31
 class Calendar implements IFilter {
32 32
 
33
-	/** @var IL10N */
34
-	protected $l;
33
+    /** @var IL10N */
34
+    protected $l;
35 35
 
36
-	/** @var IURLGenerator */
37
-	protected $url;
36
+    /** @var IURLGenerator */
37
+    protected $url;
38 38
 
39
-	public function __construct(IL10N $l, IURLGenerator $url) {
40
-		$this->l = $l;
41
-		$this->url = $url;
42
-	}
39
+    public function __construct(IL10N $l, IURLGenerator $url) {
40
+        $this->l = $l;
41
+        $this->url = $url;
42
+    }
43 43
 
44
-	/**
45
-	 * @return string Lowercase a-z and underscore only identifier
46
-	 * @since 11.0.0
47
-	 */
48
-	public function getIdentifier() {
49
-		return 'calendar';
50
-	}
44
+    /**
45
+     * @return string Lowercase a-z and underscore only identifier
46
+     * @since 11.0.0
47
+     */
48
+    public function getIdentifier() {
49
+        return 'calendar';
50
+    }
51 51
 
52
-	/**
53
-	 * @return string A translated string
54
-	 * @since 11.0.0
55
-	 */
56
-	public function getName() {
57
-		return $this->l->t('Calendar');
58
-	}
52
+    /**
53
+     * @return string A translated string
54
+     * @since 11.0.0
55
+     */
56
+    public function getName() {
57
+        return $this->l->t('Calendar');
58
+    }
59 59
 
60
-	/**
61
-	 * @return int whether the filter should be rather on the top or bottom of
62
-	 * the admin section. The filters are arranged in ascending order of the
63
-	 * priority values. It is required to return a value between 0 and 100.
64
-	 * @since 11.0.0
65
-	 */
66
-	public function getPriority() {
67
-		return 40;
68
-	}
60
+    /**
61
+     * @return int whether the filter should be rather on the top or bottom of
62
+     * the admin section. The filters are arranged in ascending order of the
63
+     * priority values. It is required to return a value between 0 and 100.
64
+     * @since 11.0.0
65
+     */
66
+    public function getPriority() {
67
+        return 40;
68
+    }
69 69
 
70
-	/**
71
-	 * @return string Full URL to an icon, empty string when none is given
72
-	 * @since 11.0.0
73
-	 */
74
-	public function getIcon() {
75
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg'));
76
-	}
70
+    /**
71
+     * @return string Full URL to an icon, empty string when none is given
72
+     * @since 11.0.0
73
+     */
74
+    public function getIcon() {
75
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg'));
76
+    }
77 77
 
78
-	/**
79
-	 * @param string[] $types
80
-	 * @return string[] An array of allowed apps from which activities should be displayed
81
-	 * @since 11.0.0
82
-	 */
83
-	public function filterTypes(array $types) {
84
-		return array_intersect(['calendar', 'calendar_event'], $types);
85
-	}
78
+    /**
79
+     * @param string[] $types
80
+     * @return string[] An array of allowed apps from which activities should be displayed
81
+     * @since 11.0.0
82
+     */
83
+    public function filterTypes(array $types) {
84
+        return array_intersect(['calendar', 'calendar_event'], $types);
85
+    }
86 86
 
87
-	/**
88
-	 * @return string[] An array of allowed apps from which activities should be displayed
89
-	 * @since 11.0.0
90
-	 */
91
-	public function allowedApps() {
92
-		return [];
93
-	}
87
+    /**
88
+     * @return string[] An array of allowed apps from which activities should be displayed
89
+     * @since 11.0.0
90
+     */
91
+    public function allowedApps() {
92
+        return [];
93
+    }
94 94
 }
Please login to merge, or discard this patch.
core/Migrations/Version14000Date20180712153140.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -30,14 +30,14 @@
 block discarded – undo
30 30
  * Class Version14000Date20180712153140
31 31
  */
32 32
 class Version14000Date20180712153140 extends SimpleMigrationStep {
33
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
33
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
34 34
 
35
-		/** @var ISchemaWrapper $schema */
36
-		$schema = $schemaClosure();
35
+        /** @var ISchemaWrapper $schema */
36
+        $schema = $schemaClosure();
37 37
 
38
-		$table = $schema->getTable('share');
39
-		$table->addColumn('note', 'text', ['notnull' => false]);
38
+        $table = $schema->getTable('share');
39
+        $table->addColumn('note', 'text', ['notnull' => false]);
40 40
 
41
-		return $schema;
42
-	}
41
+        return $schema;
42
+    }
43 43
 }
Please login to merge, or discard this patch.
core/Controller/NavigationController.php 1 patch
Indentation   +82 added lines, -82 removed lines patch added patch discarded remove patch
@@ -31,92 +31,92 @@
 block discarded – undo
31 31
 
32 32
 class NavigationController extends OCSController {
33 33
 
34
-	/** @var INavigationManager */
35
-	private $navigationManager;
34
+    /** @var INavigationManager */
35
+    private $navigationManager;
36 36
 
37
-	/** @var IURLGenerator */
38
-	private $urlGenerator;
37
+    /** @var IURLGenerator */
38
+    private $urlGenerator;
39 39
 
40
-	public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
41
-		parent::__construct($appName, $request);
42
-		$this->navigationManager = $navigationManager;
43
-		$this->urlGenerator = $urlGenerator;
44
-	}
40
+    public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
41
+        parent::__construct($appName, $request);
42
+        $this->navigationManager = $navigationManager;
43
+        $this->urlGenerator = $urlGenerator;
44
+    }
45 45
 
46
-	/**
47
-	 * @NoAdminRequired
48
-	 * @NoCSRFRequired
49
-	 *
50
-	 * @param bool $absolute
51
-	 * @return DataResponse
52
-	 */
53
-	public function getAppsNavigation(bool $absolute = false): DataResponse {
54
-		$navigation = $this->navigationManager->getAll();
55
-		if ($absolute) {
56
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
57
-		}
58
-		$navigation = array_values($navigation);
59
-		$etag = $this->generateETag($navigation);
60
-		if ($this->request->getHeader('If-None-Match') === $etag) {
61
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
62
-		}
63
-		$response = new DataResponse($navigation);
64
-		$response->setETag($etag);
65
-		return $response;
66
-	}
46
+    /**
47
+     * @NoAdminRequired
48
+     * @NoCSRFRequired
49
+     *
50
+     * @param bool $absolute
51
+     * @return DataResponse
52
+     */
53
+    public function getAppsNavigation(bool $absolute = false): DataResponse {
54
+        $navigation = $this->navigationManager->getAll();
55
+        if ($absolute) {
56
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
57
+        }
58
+        $navigation = array_values($navigation);
59
+        $etag = $this->generateETag($navigation);
60
+        if ($this->request->getHeader('If-None-Match') === $etag) {
61
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
62
+        }
63
+        $response = new DataResponse($navigation);
64
+        $response->setETag($etag);
65
+        return $response;
66
+    }
67 67
 
68
-	/**
69
-	 * @NoAdminRequired
70
-	 * @NoCSRFRequired
71
-	 *
72
-	 * @param bool $absolute
73
-	 * @return DataResponse
74
-	 */
75
-	public function getSettingsNavigation(bool $absolute = false): DataResponse {
76
-		$navigation = $this->navigationManager->getAll('settings');
77
-		if ($absolute) {
78
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
79
-		}
80
-		$navigation = array_values($navigation);
81
-		$etag = $this->generateETag($navigation);
82
-		if ($this->request->getHeader('If-None-Match') === $etag) {
83
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
84
-		}
85
-		$response = new DataResponse($navigation);
86
-		$response->setETag($etag);
87
-		return $response;
88
-	}
68
+    /**
69
+     * @NoAdminRequired
70
+     * @NoCSRFRequired
71
+     *
72
+     * @param bool $absolute
73
+     * @return DataResponse
74
+     */
75
+    public function getSettingsNavigation(bool $absolute = false): DataResponse {
76
+        $navigation = $this->navigationManager->getAll('settings');
77
+        if ($absolute) {
78
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
79
+        }
80
+        $navigation = array_values($navigation);
81
+        $etag = $this->generateETag($navigation);
82
+        if ($this->request->getHeader('If-None-Match') === $etag) {
83
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
84
+        }
85
+        $response = new DataResponse($navigation);
86
+        $response->setETag($etag);
87
+        return $response;
88
+    }
89 89
 
90
-	/**
91
-	 * Generate an ETag for a list of navigation entries
92
-	 *
93
-	 * @param array $navigation
94
-	 * @return string
95
-	 */
96
-	private function generateETag(array $navigation): string {
97
-		foreach ($navigation as &$nav) {
98
-			if ($nav['id'] === 'logout') {
99
-				$nav['href'] = 'logout';
100
-			}
101
-		}
102
-		return md5(json_encode($navigation));
103
-	}
90
+    /**
91
+     * Generate an ETag for a list of navigation entries
92
+     *
93
+     * @param array $navigation
94
+     * @return string
95
+     */
96
+    private function generateETag(array $navigation): string {
97
+        foreach ($navigation as &$nav) {
98
+            if ($nav['id'] === 'logout') {
99
+                $nav['href'] = 'logout';
100
+            }
101
+        }
102
+        return md5(json_encode($navigation));
103
+    }
104 104
 
105
-	/**
106
-	 * Rewrite href attribute of navigation entries to an absolute URL
107
-	 *
108
-	 * @param array $navigation
109
-	 * @return array
110
-	 */
111
-	private function rewriteToAbsoluteUrls(array $navigation): array {
112
-		foreach ($navigation as &$entry) {
113
-			if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
114
-				$entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
115
-			}
116
-			if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
117
-				$entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
118
-			}
119
-		}
120
-		return $navigation;
121
-	}
105
+    /**
106
+     * Rewrite href attribute of navigation entries to an absolute URL
107
+     *
108
+     * @param array $navigation
109
+     * @return array
110
+     */
111
+    private function rewriteToAbsoluteUrls(array $navigation): array {
112
+        foreach ($navigation as &$entry) {
113
+            if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
114
+                $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
115
+            }
116
+            if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
117
+                $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
118
+            }
119
+        }
120
+        return $navigation;
121
+    }
122 122
 }
Please login to merge, or discard this patch.