@@ -12,8 +12,7 @@ discard block |
||
12 | 12 | * LICENSE.txt file that was distributed with this source code. |
13 | 13 | */ |
14 | 14 | |
15 | -class AnnotationTarget |
|
16 | -{ |
|
15 | +class AnnotationTarget { |
|
17 | 16 | /** |
18 | 17 | * @var string |
19 | 18 | */ |
@@ -39,8 +38,7 @@ discard block |
||
39 | 38 | */ |
40 | 39 | protected $rangeValue; |
41 | 40 | |
42 | - public function __construct($url) |
|
43 | - { |
|
41 | + public function __construct($url) { |
|
44 | 42 | $this->url = $url; |
45 | 43 | |
46 | 44 | $path = parse_url($url, PHP_URL_PATH); |
@@ -65,40 +63,35 @@ discard block |
||
65 | 63 | /** |
66 | 64 | * @return string |
67 | 65 | */ |
68 | - public function getObjectId() |
|
69 | - { |
|
66 | + public function getObjectId() { |
|
70 | 67 | return $this->objectId; |
71 | 68 | } |
72 | 69 | |
73 | 70 | /** |
74 | 71 | * @return string |
75 | 72 | */ |
76 | - public function getId() |
|
77 | - { |
|
73 | + public function getId() { |
|
78 | 74 | return $this->id; |
79 | 75 | } |
80 | 76 | |
81 | 77 | /** |
82 | 78 | * @return string |
83 | 79 | */ |
84 | - public function getRangeParameterName() |
|
85 | - { |
|
80 | + public function getRangeParameterName() { |
|
86 | 81 | return $this->rangeParameterName; |
87 | 82 | } |
88 | 83 | |
89 | 84 | /** |
90 | 85 | * @return string |
91 | 86 | */ |
92 | - public function getRangeValue() |
|
93 | - { |
|
87 | + public function getRangeValue() { |
|
94 | 88 | return $this->rangeValue; |
95 | 89 | } |
96 | 90 | |
97 | 91 | /** |
98 | 92 | * @return bool |
99 | 93 | */ |
100 | - public function isValid() |
|
101 | - { |
|
94 | + public function isValid() { |
|
102 | 95 | if (empty($this->getObjectId())) { |
103 | 96 | return false; |
104 | 97 | } |
@@ -113,8 +106,7 @@ discard block |
||
113 | 106 | /** |
114 | 107 | * @return bool |
115 | 108 | */ |
116 | - public function isValidRange() |
|
117 | - { |
|
109 | + public function isValidRange() { |
|
118 | 110 | if (empty($this->rangeParameterName) && empty($this->rangeValue)) { |
119 | 111 | return true; |
120 | 112 | } elseif ($this->isFacsimileRange()) { |
@@ -131,24 +123,21 @@ discard block |
||
131 | 123 | /** |
132 | 124 | * @return bool |
133 | 125 | */ |
134 | - public function isScoreRange() |
|
135 | - { |
|
126 | + public function isScoreRange() { |
|
136 | 127 | return $this->getRangeParameterName() === 'measureRanges'; |
137 | 128 | } |
138 | 129 | |
139 | 130 | /** |
140 | 131 | * @return bool |
141 | 132 | */ |
142 | - public function isAudioRange() |
|
143 | - { |
|
133 | + public function isAudioRange() { |
|
144 | 134 | return $this->getRangeParameterName() === 't'; |
145 | 135 | } |
146 | 136 | |
147 | 137 | /** |
148 | 138 | * @return bool |
149 | 139 | */ |
150 | - public function isFacsimileRange() |
|
151 | - { |
|
140 | + public function isFacsimileRange() { |
|
152 | 141 | return $this->getRangeParameterName() === 'xywh'; |
153 | 142 | } |
154 | 143 | } |
@@ -12,8 +12,7 @@ discard block |
||
12 | 12 | * LICENSE.txt file that was distributed with this source code. |
13 | 13 | */ |
14 | 14 | |
15 | -class Annotation |
|
16 | -{ |
|
15 | +class Annotation { |
|
17 | 16 | /** |
18 | 17 | * The complete data of the annotation |
19 | 18 | * |
@@ -30,8 +29,7 @@ discard block |
||
30 | 29 | /** |
31 | 30 | * @param array $data |
32 | 31 | */ |
33 | - public function __construct($data) |
|
34 | - { |
|
32 | + public function __construct($data) { |
|
35 | 33 | $this->data = $data; |
36 | 34 | } |
37 | 35 | |
@@ -40,8 +38,7 @@ discard block |
||
40 | 38 | * |
41 | 39 | * @return array |
42 | 40 | */ |
43 | - public function getRawData() |
|
44 | - { |
|
41 | + public function getRawData() { |
|
45 | 42 | return $this->data; |
46 | 43 | } |
47 | 44 | |
@@ -50,8 +47,7 @@ discard block |
||
50 | 47 | * |
51 | 48 | * @return string |
52 | 49 | */ |
53 | - public function getId() |
|
54 | - { |
|
50 | + public function getId() { |
|
55 | 51 | return $this->data['id'] ?? ''; |
56 | 52 | } |
57 | 53 | |
@@ -60,8 +56,7 @@ discard block |
||
60 | 56 | * |
61 | 57 | * @return string |
62 | 58 | */ |
63 | - public function getTitle() |
|
64 | - { |
|
59 | + public function getTitle() { |
|
65 | 60 | return $this->data['title'] ?? ''; |
66 | 61 | } |
67 | 62 | |
@@ -70,8 +65,7 @@ discard block |
||
70 | 65 | * |
71 | 66 | * @return array |
72 | 67 | */ |
73 | - public function getBody() |
|
74 | - { |
|
68 | + public function getBody() { |
|
75 | 69 | $body = $this->data['body'] ?? ''; |
76 | 70 | |
77 | 71 | if (is_array($body)) { |
@@ -85,8 +79,7 @@ discard block |
||
85 | 79 | * Gets the name of the annotation creator |
86 | 80 | * @return string |
87 | 81 | */ |
88 | - public function getCreatorName() |
|
89 | - { |
|
82 | + public function getCreatorName() { |
|
90 | 83 | return $this->data['creator']['displayName'] ?? ''; |
91 | 84 | } |
92 | 85 | |
@@ -94,8 +87,7 @@ discard block |
||
94 | 87 | * Gets the creation date of the annotation |
95 | 88 | * @return string |
96 | 89 | */ |
97 | - public function getCreated() |
|
98 | - { |
|
90 | + public function getCreated() { |
|
99 | 91 | return $this->data['created'] ?? ''; |
100 | 92 | } |
101 | 93 | |
@@ -103,8 +95,7 @@ discard block |
||
103 | 95 | * Gets the modification date of the annotation |
104 | 96 | * @return string |
105 | 97 | */ |
106 | - public function getModified() |
|
107 | - { |
|
98 | + public function getModified() { |
|
108 | 99 | return $this->data['modified'] ?? ''; |
109 | 100 | } |
110 | 101 | |
@@ -113,8 +104,7 @@ discard block |
||
113 | 104 | * |
114 | 105 | * @return AnnotationTarget[] |
115 | 106 | */ |
116 | - public function getTargets() |
|
117 | - { |
|
107 | + public function getTargets() { |
|
118 | 108 | if (is_string($this->data['target'])) { |
119 | 109 | return [new AnnotationTarget($this->data['target'])]; |
120 | 110 | } |
@@ -133,8 +123,7 @@ discard block |
||
133 | 123 | * @param array $targetPages |
134 | 124 | * @return void |
135 | 125 | */ |
136 | - public function setTargetPages($targetPages) |
|
137 | - { |
|
126 | + public function setTargetPages($targetPages) { |
|
138 | 127 | $this->targetPages = $targetPages; |
139 | 128 | } |
140 | 129 | |
@@ -143,8 +132,7 @@ discard block |
||
143 | 132 | * |
144 | 133 | * @return array |
145 | 134 | */ |
146 | - public function getTargetPages() |
|
147 | - { |
|
135 | + public function getTargetPages() { |
|
148 | 136 | return $this->targetPages; |
149 | 137 | } |
150 | 138 | |
@@ -153,8 +141,7 @@ discard block |
||
153 | 141 | * |
154 | 142 | * @return array |
155 | 143 | */ |
156 | - public function getPageNumbers() |
|
157 | - { |
|
144 | + public function getPageNumbers() { |
|
158 | 145 | $pages = []; |
159 | 146 | if (is_array($this->targetPages)) { |
160 | 147 | foreach ($this->targetPages as $target) { |
@@ -170,8 +157,7 @@ discard block |
||
170 | 157 | * |
171 | 158 | * @return array |
172 | 159 | */ |
173 | - public function getPageTargets() |
|
174 | - { |
|
160 | + public function getPageTargets() { |
|
175 | 161 | $pageTargets = []; |
176 | 162 | if (is_array($this->targetPages)) { |
177 | 163 | foreach ($this->targetPages as $target) { |
@@ -189,8 +175,7 @@ discard block |
||
189 | 175 | * |
190 | 176 | * @return array |
191 | 177 | */ |
192 | - public function getPageAudioRanges() |
|
193 | - { |
|
178 | + public function getPageAudioRanges() { |
|
194 | 179 | $ranges = []; |
195 | 180 | if (is_array($this->getPageTargets())) { |
196 | 181 | foreach ($this->getPageTargets() as $pageNumber => $targets) { |
@@ -209,8 +194,7 @@ discard block |
||
209 | 194 | * |
210 | 195 | * @return array |
211 | 196 | */ |
212 | - public function getPageScoreRanges() |
|
213 | - { |
|
197 | + public function getPageScoreRanges() { |
|
214 | 198 | $ranges = []; |
215 | 199 | if (is_array($this->getPageTargets())) { |
216 | 200 | foreach ($this->getPageTargets() as $pageNumber => $targets) { |
@@ -229,8 +213,7 @@ discard block |
||
229 | 213 | * |
230 | 214 | * @return array |
231 | 215 | */ |
232 | - public function getPageFacsimileRanges() |
|
233 | - { |
|
216 | + public function getPageFacsimileRanges() { |
|
234 | 217 | $ranges = []; |
235 | 218 | if (is_array($this->getPageTargets())) { |
236 | 219 | foreach ($this->getPageTargets() as $pageNumber => $targets) { |
@@ -250,8 +233,7 @@ discard block |
||
250 | 233 | * |
251 | 234 | * @return bool |
252 | 235 | */ |
253 | - public function isVerovioRelevant() |
|
254 | - { |
|
236 | + public function isVerovioRelevant() { |
|
255 | 237 | foreach ($this->targetPages as $target) { |
256 | 238 | if (array_key_exists('verovioRelevant', $target) && $target['verovioRelevant']) { |
257 | 239 | return true; |
@@ -30,8 +30,7 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @access public |
32 | 32 | */ |
33 | -class MetadataFormat extends AbstractEntity |
|
34 | -{ |
|
33 | +class MetadataFormat extends AbstractEntity { |
|
35 | 34 | /** |
36 | 35 | * @access protected |
37 | 36 | * @var int UID of the ``tx_dlf_metadata`` that is encoded by this metadata entry. |
@@ -76,14 +75,12 @@ discard block |
||
76 | 75 | /** |
77 | 76 | * constructor |
78 | 77 | */ |
79 | - public function __construct() |
|
80 | - { |
|
78 | + public function __construct() { |
|
81 | 79 | // Do not remove the next line: It would break the functionality |
82 | 80 | $this->initStorageObjects(); |
83 | 81 | } |
84 | 82 | |
85 | - protected function initStorageObjects() |
|
86 | - { |
|
83 | + protected function initStorageObjects() { |
|
87 | 84 | $this->subentries = new ObjectStorage(); |
88 | 85 | } |
89 | 86 | |
@@ -151,8 +148,7 @@ discard block |
||
151 | 148 | $this->xpathSorting = $xpathSorting; |
152 | 149 | } |
153 | 150 | |
154 | - public function getSubentries() |
|
155 | - { |
|
151 | + public function getSubentries() { |
|
156 | 152 | return $this->subentries; |
157 | 153 | } |
158 | 154 | |
@@ -168,8 +164,7 @@ discard block |
||
168 | 164 | * |
169 | 165 | * @return void |
170 | 166 | */ |
171 | - public function addSubentry(MetadataSubentry $subentry) |
|
172 | - { |
|
167 | + public function addSubentry(MetadataSubentry $subentry) { |
|
173 | 168 | $this->subentries->attach($subentry); |
174 | 169 | } |
175 | 170 | |
@@ -180,8 +175,7 @@ discard block |
||
180 | 175 | * |
181 | 176 | * @return void |
182 | 177 | */ |
183 | - public function removeSubentry(MetadataSubentry $subentryToRemove) |
|
184 | - { |
|
178 | + public function removeSubentry(MetadataSubentry $subentryToRemove) { |
|
185 | 179 | $this->subentries->detach($subentryToRemove); |
186 | 180 | } |
187 | 181 |
@@ -24,8 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | * @access public |
26 | 26 | */ |
27 | -class ToolboxController extends AbstractController |
|
28 | -{ |
|
27 | +class ToolboxController extends AbstractController { |
|
29 | 28 | |
30 | 29 | /** |
31 | 30 | * @access private |
@@ -208,8 +207,7 @@ discard block |
||
208 | 207 | * |
209 | 208 | * @return void |
210 | 209 | */ |
211 | - public function renderScoreTool() |
|
212 | - { |
|
210 | + public function renderScoreTool() { |
|
213 | 211 | if ( |
214 | 212 | $this->isDocMissingOrEmpty() |
215 | 213 | || empty($this->extConf['files']['fileGrpScore']) |
@@ -30,8 +30,7 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @access public |
32 | 32 | */ |
33 | -class PageViewController extends AbstractController |
|
34 | -{ |
|
33 | +class PageViewController extends AbstractController { |
|
35 | 34 | /** |
36 | 35 | * @access protected |
37 | 36 | * @var array Holds the controls to add to the map |
@@ -256,8 +255,7 @@ discard block |
||
256 | 255 | * @param $page |
257 | 256 | * @return false|int|mixed|string|null |
258 | 257 | */ |
259 | - public function convertMeasureOrPage($document, $measure = null, $page = null) |
|
260 | - { |
|
258 | + public function convertMeasureOrPage($document, $measure = null, $page = null) { |
|
261 | 259 | $return = null; |
262 | 260 | $measure2Page = array_column($document->musicalStructure, 'page'); |
263 | 261 | if ($measure) { |
@@ -273,8 +271,7 @@ discard block |
||
273 | 271 | * Action to add multiple mets sources (multi page view) |
274 | 272 | * @return void |
275 | 273 | */ |
276 | - public function addDocumentAction(FormAddDocument $formAddDocument) |
|
277 | - { |
|
274 | + public function addDocumentAction(FormAddDocument $formAddDocument) { |
|
278 | 275 | if (GeneralUtility::isValidUrl($formAddDocument->getLocation())) { |
279 | 276 | $nextMultipleSourceKey = 0; |
280 | 277 | if ($this->requestData['multipleSource']) { |
@@ -367,8 +364,7 @@ discard block |
||
367 | 364 | * |
368 | 365 | * @return array URL and MIME type of fulltext file |
369 | 366 | */ |
370 | - protected function getScore(int $page, MetsDocument $specificDoc = null) |
|
371 | - { |
|
367 | + protected function getScore(int $page, MetsDocument $specificDoc = null) { |
|
372 | 368 | $score = []; |
373 | 369 | $loc = ''; |
374 | 370 | if ($specificDoc) { |
@@ -21,15 +21,13 @@ |
||
21 | 21 | * @subpackage dlf |
22 | 22 | * @access public |
23 | 23 | */ |
24 | -class AnnotationController extends AbstractController |
|
25 | -{ |
|
24 | +class AnnotationController extends AbstractController { |
|
26 | 25 | /** |
27 | 26 | * The main method of the plugin |
28 | 27 | * |
29 | 28 | * @return void |
30 | 29 | */ |
31 | - public function mainAction() |
|
32 | - { |
|
30 | + public function mainAction() { |
|
33 | 31 | $this->loadDocument(); |
34 | 32 | |
35 | 33 | if ( |
@@ -18,10 +18,8 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Checks if the given subject is an array. |
20 | 20 | */ |
21 | -class IsArrayViewHelper extends AbstractViewHelper |
|
22 | -{ |
|
23 | - public function initializeArguments() |
|
24 | - { |
|
21 | +class IsArrayViewHelper extends AbstractViewHelper { |
|
22 | + public function initializeArguments() { |
|
25 | 23 | parent::initializeArguments(); |
26 | 24 | $this->registerArgument('subject', 'string', 'The subject'); |
27 | 25 | } |
@@ -29,8 +27,7 @@ discard block |
||
29 | 27 | /** |
30 | 28 | * @return bool |
31 | 29 | */ |
32 | - public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) |
|
33 | - { |
|
30 | + public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) { |
|
34 | 31 | $subject = $arguments['subject']; |
35 | 32 | if ($subject === null) { |
36 | 33 | $subject = $renderChildrenClosure(); |
@@ -13,10 +13,8 @@ discard block |
||
13 | 13 | |
14 | 14 | use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; |
15 | 15 | |
16 | -class IsInArrayViewHelper extends AbstractViewHelper |
|
17 | -{ |
|
18 | - public function initializeArguments() |
|
19 | - { |
|
16 | +class IsInArrayViewHelper extends AbstractViewHelper { |
|
17 | + public function initializeArguments() { |
|
20 | 18 | parent::initializeArguments(); |
21 | 19 | $this->registerArgument('needle', 'mixed', 'The searched value', true); |
22 | 20 | $this->registerArgument('haystack', 'array', 'The array', true); |
@@ -27,8 +25,7 @@ discard block |
||
27 | 25 | * |
28 | 26 | * @return bool |
29 | 27 | */ |
30 | - public function render() |
|
31 | - { |
|
28 | + public function render() { |
|
32 | 29 | $needle = $this->arguments['needle']; |
33 | 30 | $haystack = $this->arguments['haystack']; |
34 | 31 |
@@ -13,10 +13,8 @@ discard block |
||
13 | 13 | |
14 | 14 | use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; |
15 | 15 | |
16 | -class ImplodeViewHelper extends AbstractViewHelper |
|
17 | -{ |
|
18 | - public function initializeArguments() |
|
19 | - { |
|
16 | +class ImplodeViewHelper extends AbstractViewHelper { |
|
17 | + public function initializeArguments() { |
|
20 | 18 | parent::initializeArguments(); |
21 | 19 | $this->registerArgument('value', 'array', 'The array to be imploded', true); |
22 | 20 | $this->registerArgument('delimiter', 'string', 'The delimiter ', true); |
@@ -27,8 +25,7 @@ discard block |
||
27 | 25 | * |
28 | 26 | * @return string |
29 | 27 | */ |
30 | - public function render() |
|
31 | - { |
|
28 | + public function render() { |
|
32 | 29 | $value = $this->arguments['value']; |
33 | 30 | $delimiter = $this->arguments['delimiter']; |
34 | 31 |