@@ -151,8 +151,9 @@ discard block  | 
                                                    ||
| 151 | 151 | * If we are using MySQLDatabase with InnoDB, we do row-level locking when updating the dataobject to allow for  | 
                                                        
| 152 | 152 | * distributed cache rebuilds  | 
                                                        
| 153 | 153 | * @static  | 
                                                        
| 154 | - * @param $freshness  | 
                                                        |
| 154 | + * @param string $freshness  | 
                                                        |
| 155 | 155 | * @param $sortOrder  | 
                                                        
| 156 | + * @param string $interval  | 
                                                        |
| 156 | 157 | */  | 
                                                        
| 157 | 158 |  	protected static function get_queue_object($freshness, $interval = null, $sortOrder = array('Priority'=>'DESC', 'ID'=>'ASC')) { | 
                                                        
| 158 | 159 | $className = __CLASS__;  | 
                                                        
@@ -254,7 +255,7 @@ discard block  | 
                                                    ||
| 254 | 255 | * Removes all duplicates that has the same URLSegment as $ID  | 
                                                        
| 255 | 256 | *  | 
                                                        
| 256 | 257 | * @param int $ID - ID of the object whose duplicates we want to remove  | 
                                                        
| 257 | - * @return void  | 
                                                        |
| 258 | + * @return integer|null  | 
                                                        |
| 258 | 259 | */  | 
                                                        
| 259 | 260 |  	static function remove_duplicates( $ID ) { | 
                                                        
| 260 | 261 |  		$obj = DataObject::get_by_id('StaticPagesQueue', $ID); | 
                                                        
@@ -267,7 +268,6 @@ discard block  | 
                                                    ||
| 267 | 268 | /**  | 
                                                        
| 268 | 269 | *  | 
                                                        
| 269 | 270 | * @param string $url  | 
                                                        
| 270 | - * @param bool $onlyStale - Get only stale entries  | 
                                                        |
| 271 | 271 | * @return DataObject || false - The first item matching the query  | 
                                                        
| 272 | 272 | */  | 
                                                        
| 273 | 273 |  	protected static function get_by_link($url) { | 
                                                        
@@ -157,7 +157,7 @@ discard block  | 
                                                    ||
| 157 | 157 | * If a SubsiteID GET parameter is found in the URL, the page is generated into a directory,  | 
                                                        
| 158 | 158 | * regardless if it's from the main site or subsite.  | 
                                                        
| 159 | 159 | *  | 
                                                        
| 160 | - * @param array $URLSegments  | 
                                                        |
| 160 | + * @param string[] $URLSegments  | 
                                                        |
| 161 | 161 | */  | 
                                                        
| 162 | 162 |  	protected function createCachedFiles(array $URLSegments) { | 
                                                        
| 163 | 163 | $results = array();  | 
                                                        
@@ -302,6 +302,8 @@ discard block  | 
                                                    ||
| 302 | 302 | /**  | 
                                                        
| 303 | 303 | *  | 
                                                        
| 304 | 304 | * @param int $publishedPages - the number of pages published so far  | 
                                                        
| 305 | + * @param boolean $finished  | 
                                                        |
| 306 | + * @param double $prePublishTime  | 
                                                        |
| 305 | 307 | */  | 
                                                        
| 306 | 308 |  	protected function logSummary( $publishedPages, $finished, $prePublishTime ) { | 
                                                        
| 307 | 309 |  		if(!$publishedPages) { | 
                                                        
@@ -345,6 +347,7 @@ discard block  | 
                                                    ||
| 345 | 347 | * Check if another instance is running with the regard to a timelimit.  | 
                                                        
| 346 | 348 | *  | 
                                                        
| 347 | 349 | * @var int $secondsBeforeDead  | 
                                                        
| 350 | + * @param integer $secondsBeforeDead  | 
                                                        |
| 348 | 351 | * @return bool  | 
                                                        
| 349 | 352 | */  | 
                                                        
| 350 | 353 |  	protected function anotherInstanceRunning($secondsBeforeDead) { | 
                                                        
@@ -369,7 +372,6 @@ discard block  | 
                                                    ||
| 369 | 372 | /**  | 
                                                        
| 370 | 373 | * Adds information to the pid file  | 
                                                        
| 371 | 374 | *  | 
                                                        
| 372 | - * @param float $microtime  | 
                                                        |
| 373 | 375 | * @return void  | 
                                                        
| 374 | 376 | */  | 
                                                        
| 375 | 377 |  	protected function updatePid() { | 
                                                        
@@ -46,7 +46,7 @@ discard block  | 
                                                    ||
| 46 | 46 | /**  | 
                                                        
| 47 | 47 | *  | 
                                                        
| 48 | 48 | * @param SS_HTTPRequest $request  | 
                                                        
| 49 | - * @return bool  | 
                                                        |
| 49 | + * @return boolean|null  | 
                                                        |
| 50 | 50 | */  | 
                                                        
| 51 | 51 |  	public function run($request) { | 
                                                        
| 52 | 52 | |
@@ -89,7 +89,7 @@ discard block  | 
                                                    ||
| 89 | 89 | |
| 90 | 90 | /**  | 
                                                        
| 91 | 91 | * Process a chunk of pages  | 
                                                        
| 92 | - * @param $start  | 
                                                        |
| 92 | + * @param integer $start  | 
                                                        |
| 93 | 93 | */  | 
                                                        
| 94 | 94 |  	protected function runFrom($start) { | 
                                                        
| 95 | 95 | $chunkSize = (int)self::config()->records_per_request;  | 
                                                        
@@ -78,7 +78,7 @@ discard block  | 
                                                    ||
| 78 | 78 | /**  | 
                                                        
| 79 | 79 | * @param $destFolder The folder to save the cached site into.  | 
                                                        
| 80 | 80 |  	 *   This needs to be set in framework/static-main.php as well through the {@link $cacheBaseDir} variable. | 
                                                        
| 81 | - * @param $fileExtension The file extension to use, e.g 'html'.  | 
                                                        |
| 81 | + * @param string $fileExtension The file extension to use, e.g 'html'.  | 
                                                        |
| 82 | 82 | * If omitted, then each page will be placed in its own directory,  | 
                                                        
| 83 | 83 | * with the filename 'index.html'. If you set the extension to PHP, then a simple PHP script will  | 
                                                        
| 84 | 84 | * be generated that can do appropriate cache & redirect header negotation.  | 
                                                        
@@ -449,7 +449,7 @@ discard block  | 
                                                    ||
| 449 | 449 | /**  | 
                                                        
| 450 | 450 | * @param string $url  | 
                                                        
| 451 | 451 | *  | 
                                                        
| 452 | - * @return array  | 
                                                        |
| 452 | + * @return string[]  | 
                                                        |
| 453 | 453 | */  | 
                                                        
| 454 | 454 |  	public function getMetadata($url) { | 
                                                        
| 455 | 455 | return array(  | 
                                                        
@@ -257,6 +257,10 @@  | 
                                                    ||
| 257 | 257 | |
| 258 | 258 |  class SiteTreePublishingEngineTest_StaticPublishingTrigger extends SiteTree implements TestOnly, StaticPublishingTrigger { | 
                                                        
| 259 | 259 | |
| 260 | + /**  | 
                                                        |
| 261 | + * @param string $url  | 
                                                        |
| 262 | + * @param integer $prio  | 
                                                        |
| 263 | + */  | 
                                                        |
| 260 | 264 |  	public function generatePublishable($url, $prio) { | 
                                                        
| 261 | 265 |  		$obj = Object::create('SiteTreePublishingEngineTest_StaticallyPublishable'); | 
                                                        
| 262 | 266 | $obj->url = $url;  |