Completed
Push — master ( aab69e...f7bdc5 )
by Daniel
12s
created
code/tasks/SubsiteCopyPagesTask.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -70,6 +70,9 @@
 block discarded – undo
70 70
         }
71 71
     }
72 72
 
73
+    /**
74
+     * @param string $msg
75
+     */
73 76
     public function log($msg)
74 77
     {
75 78
         echo $msg . "\n";
Please login to merge, or discard this patch.
code/model/Subsite.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
      * for example matching all subdomains on *.example.com with one subsite,
205 205
      * and all subdomains on *.example.org on another.
206 206
      *
207
-     * @param $host string The host to find the subsite for.  If not specified, $_SERVER['HTTP_HOST'] is used.
207
+     * @param string $host string The host to find the subsite for.  If not specified, $_SERVER['HTTP_HOST'] is used.
208 208
      * @param bool $checkPermissions
209 209
      * @return int Subsite ID
210 210
      */
@@ -329,6 +329,10 @@  discard block
 block discarded – undo
329 329
      *
330 330
      * @return ArrayList of {@link Subsite} instances.
331 331
      */
332
+
333
+    /**
334
+     * @param DataObject $member
335
+     */
332 336
     public static function all_accessible_sites($includeMainSite = true, $mainSiteTitle = 'Main site', $member = null)
333 337
     {
334 338
         // Rationalise member arguments
@@ -371,7 +375,7 @@  discard block
 block discarded – undo
371 375
      * @param $permCode array|string Either a single permission code or an array of permission codes.
372 376
      * @param $includeMainSite bool If true, the main site will be included if appropriate.
373 377
      * @param $mainSiteTitle string The label to give to the main site
374
-     * @param $member int|Member The member attempting to access the sites
378
+     * @param DataObject $member int|Member The member attempting to access the sites
375 379
      * @return DataList|ArrayList of {@link Subsite} instances
376 380
      */
377 381
     public static function accessible_sites(
Please login to merge, or discard this patch.
tests/php/FileSubsitesTest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use SilverStripe\Assets\File;
6 6
 use SilverStripe\Assets\Folder;
7 7
 use SilverStripe\Forms\FieldList;
8
-use SilverStripe\Security\Member;
9 8
 use SilverStripe\Subsites\Extensions\FileSubsites;
10 9
 use SilverStripe\Subsites\Model\Subsite;
11 10
 
Please login to merge, or discard this patch.
tests/php/SubsitesVirtualPageTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -303,6 +303,9 @@
 block discarded – undo
303 303
         );
304 304
     }
305 305
 
306
+    /**
307
+     * @param SubsitesVirtualPage $page
308
+     */
306 309
     protected function fixVersionNumberCache($page)
307 310
     {
308 311
         $pages = func_get_args();
Please login to merge, or discard this patch.
code/extensions/SiteTreeSubsites.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -261,8 +261,8 @@  discard block
 block discarded – undo
261 261
      * - Is in a group which has access to the subsite this page belongs to
262 262
      * - Is in a group with edit permissions on the "main site"
263 263
      *
264
-     * @param null $member
265
-     * @return bool
264
+     * @param null|\SilverStripe\Security\Member $member
265
+     * @return false|null
266 266
      */
267 267
     public function canEdit($member = null)
268 268
     {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 
293 293
     /**
294 294
      * @param null $member
295
-     * @return bool
295
+     * @return false|null
296 296
      */
297 297
     public function canDelete($member = null)
298 298
     {
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 
306 306
     /**
307 307
      * @param null $member
308
-     * @return bool
308
+     * @return false|null
309 309
      */
310 310
     public function canAddChildren($member = null)
311 311
     {
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 
319 319
     /**
320 320
      * @param null $member
321
-     * @return bool
321
+     * @return false|null
322 322
      */
323 323
     public function canPublish($member = null)
324 324
     {
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 
461 461
     /**
462 462
      * @param Member
463
-     * @return boolean|null
463
+     * @return false|null
464 464
      */
465 465
     public function canCreate($member = null)
466 466
     {
Please login to merge, or discard this patch.
code/forms/SubsitesTreeDropdownField.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use SilverStripe\Control\Controller;
6 6
 use SilverStripe\Control\HTTPRequest;
7
-use SilverStripe\Control\Session;
8 7
 use SilverStripe\Core\Manifest\ModuleLoader;
9 8
 use SilverStripe\Forms\TreeDropdownField;
10 9
 use SilverStripe\View\Requirements;
Please login to merge, or discard this patch.
tests/php/SubsiteAdminFunctionalTest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,6 @@
 block discarded – undo
7 7
 use SilverStripe\Core\Config\Config;
8 8
 use SilverStripe\Dev\FunctionalTest;
9 9
 use SilverStripe\Subsites\Model\Subsite;
10
-use SilverStripe\Subsites\State\SubsiteState;
11 10
 
12 11
 class SubsiteAdminFunctionalTest extends FunctionalTest
13 12
 {
Please login to merge, or discard this patch.
tests/php/SiteTreeSubsitesTest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace SilverStripe\Subsites\Tests;
4 4
 
5 5
 use Page;
6
-use SilverStripe\Assets\FileNameFilter;
7 6
 use SilverStripe\CMS\Controllers\CMSMain;
8 7
 use SilverStripe\CMS\Controllers\ModelAsController;
9 8
 use SilverStripe\CMS\Model\SiteTree;
Please login to merge, or discard this patch.