@@ -2,14 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Framework\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use Behat\Behat\Context\ClosuredContextInterface; |
|
| 6 | -use Behat\Behat\Context\TranslatedContextInterface; |
|
| 7 | 5 | use Behat\Behat\Context\BehatContext; |
| 8 | 6 | use Behat\Behat\Context\Step; |
| 9 | -use Behat\Behat\Exception\PendingException; |
|
| 10 | -use Behat\Mink\Exception\ElementNotFoundException; |
|
| 11 | -use Behat\Gherkin\Node\PyStringNode; |
|
| 12 | -use Behat\Gherkin\Node\TableNode; |
|
| 13 | 7 | use Behat\Mink\Element\NodeElement; |
| 14 | 8 | |
| 15 | 9 | /** |
@@ -608,6 +608,11 @@ |
||
| 608 | 608 | 'ObjectTest_Extending_Extension' |
| 609 | 609 | ); |
| 610 | 610 | |
| 611 | + /** |
|
| 612 | + * @param integer $first |
|
| 613 | + * @param integer $second |
|
| 614 | + * @param integer $third |
|
| 615 | + */ |
|
| 611 | 616 | public function getResults(&$first, &$second, &$third) { |
| 612 | 617 | // Before extending should be invoked second |
| 613 | 618 | $this->beforeExtending('updateResult', function(&$first, &$second, &$third) { |
@@ -634,6 +634,9 @@ discard block |
||
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | |
| 637 | + /** |
|
| 638 | + * @param string $fileID |
|
| 639 | + */ |
|
| 637 | 640 | public function getOriginalFilename($fileID) { |
| 638 | 641 | return parent::getOriginalFilename($fileID); |
| 639 | 642 | } |
@@ -642,6 +645,9 @@ discard block |
||
| 642 | 645 | return parent::removeVariant($fileID); |
| 643 | 646 | } |
| 644 | 647 | |
| 648 | + /** |
|
| 649 | + * @param null|string $variant |
|
| 650 | + */ |
|
| 645 | 651 | public function getDefaultConflictResolution($variant) { |
| 646 | 652 | return parent::getDefaultConflictResolution($variant); |
| 647 | 653 | } |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use League\Flysystem\AdapterInterface; |
| 5 | 5 | use League\Flysystem\Filesystem; |
| 6 | 6 | use SilverStripe\Filesystem\Flysystem\FlysystemAssetStore; |
| 7 | -use SilverStripe\Filesystem\Flysystem\FlysystemUrlPlugin; |
|
| 8 | 7 | use SilverStripe\Filesystem\Flysystem\ProtectedAssetAdapter; |
| 9 | 8 | use SilverStripe\Filesystem\Flysystem\PublicAssetAdapter; |
| 10 | 9 | use SilverStripe\Filesystem\Storage\AssetContainer; |
@@ -626,6 +626,10 @@ |
||
| 626 | 626 | } |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | + /** |
|
| 630 | + * @param Requirements_Backend $backend |
|
| 631 | + * @param string $type |
|
| 632 | + */ |
|
| 629 | 633 | public function assertFileNotIncluded($backend, $type, $files) { |
| 630 | 634 | $includedFiles = $this->getBackendFiles($backend, $type); |
| 631 | 635 | if(is_array($files)) { |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Filesystem as SS_Filesystem; |
| 4 | 4 | use League\Flysystem\Filesystem; |
| 5 | -use SilverStripe\Filesystem\Flysystem\AssetAdapter; |
|
| 6 | -use SilverStripe\Filesystem\Flysystem\FlysystemAssetStore; |
|
| 7 | -use SilverStripe\Filesystem\Flysystem\FlysystemUrlPlugin; |
|
| 8 | 5 | |
| 9 | 6 | /** |
| 10 | 7 | * @package framework |
@@ -50,14 +50,7 @@ discard block |
||
| 50 | 50 | /** |
| 51 | 51 | * Gets a field from this object. |
| 52 | 52 | * |
| 53 | - * @param string $field |
|
| 54 | - * |
|
| 55 | - * If the value is an object but not an instance of |
|
| 56 | - * ViewableData, it will be converted recursively to an |
|
| 57 | - * ArrayData. |
|
| 58 | - * |
|
| 59 | - * If the value is an associative array, it will likewise be |
|
| 60 | - * converted recursively to an ArrayData. |
|
| 53 | + * @param string $f |
|
| 61 | 54 | */ |
| 62 | 55 | public function getField($f) { |
| 63 | 56 | $value = $this->array[$f]; |
@@ -83,6 +76,7 @@ discard block |
||
| 83 | 76 | * Check array to see if field isset |
| 84 | 77 | * |
| 85 | 78 | * @param string Field Key |
| 79 | + * @param string $f |
|
| 86 | 80 | * @return bool |
| 87 | 81 | */ |
| 88 | 82 | public function hasField($f) { |
@@ -65,6 +65,7 @@ discard block |
||
| 65 | 65 | * while automatically busting this cache every time the file is changed. |
| 66 | 66 | * |
| 67 | 67 | * @param bool |
| 68 | + * @param boolean $var |
|
| 68 | 69 | */ |
| 69 | 70 | public static function set_suffix_requirements($var) { |
| 70 | 71 | self::backend()->setSuffixRequirements($var); |
@@ -329,7 +330,7 @@ discard block |
||
| 329 | 330 | * </code> |
| 330 | 331 | * |
| 331 | 332 | * @param string $combinedFileName Filename of the combined file relative to docroot |
| 332 | - * @param array $files Array of filenames relative to docroot |
|
| 333 | + * @param string[] $files Array of filenames relative to docroot |
|
| 333 | 334 | * @param string $media |
| 334 | 335 | * |
| 335 | 336 | * @return bool|void |
@@ -754,6 +755,7 @@ discard block |
||
| 754 | 755 | * Forces the JavaScript requirements to the end of the body, right before the closing tag |
| 755 | 756 | * |
| 756 | 757 | * @param bool |
| 758 | + * @param boolean $var |
|
| 757 | 759 | * @return $this |
| 758 | 760 | */ |
| 759 | 761 | public function setForceJSToBottom($var) { |
@@ -1611,8 +1613,8 @@ discard block |
||
| 1611 | 1613 | /** |
| 1612 | 1614 | * Given a filename and list of files, generate a new filename unique to these files |
| 1613 | 1615 | * |
| 1614 | - * @param string $name |
|
| 1615 | - * @param array $files |
|
| 1616 | + * @param array $fileList |
|
| 1617 | + * @param string $combinedFile |
|
| 1616 | 1618 | * @return string |
| 1617 | 1619 | */ |
| 1618 | 1620 | protected function hashedCombinedFilename($combinedFile, $fileList) { |
@@ -121,6 +121,7 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | /** |
| 123 | 123 | * Set the DataModel for this request. |
| 124 | + * @param DataModel $model |
|
| 124 | 125 | */ |
| 125 | 126 | public function setDataModel($model) { |
| 126 | 127 | $this->model = $model; |
@@ -238,6 +239,9 @@ discard block |
||
| 238 | 239 | return $this; |
| 239 | 240 | } |
| 240 | 241 | |
| 242 | + /** |
|
| 243 | + * @param SS_HTTPRequest $request |
|
| 244 | + */ |
|
| 241 | 245 | protected function findAction($request) { |
| 242 | 246 | $handlerClass = ($this->class) ? $this->class : get_class($this); |
| 243 | 247 | |
@@ -271,7 +275,7 @@ discard block |
||
| 271 | 275 | * |
| 272 | 276 | * Must not raise SS_HTTPResponse_Exceptions - instead it should return |
| 273 | 277 | * |
| 274 | - * @param $request |
|
| 278 | + * @param SS_HTTPRequest $request |
|
| 275 | 279 | * @param $action |
| 276 | 280 | * @return SS_HTTPResponse |
| 277 | 281 | */ |
@@ -384,6 +388,7 @@ discard block |
||
| 384 | 388 | |
| 385 | 389 | /** |
| 386 | 390 | * Return the class that defines the given action, so that we know where to check allowed_actions. |
| 391 | + * @return string|null |
|
| 387 | 392 | */ |
| 388 | 393 | protected function definingClassForAction($actionOrigCasing) { |
| 389 | 394 | $action = strtolower($actionOrigCasing); |
@@ -493,6 +498,7 @@ discard block |
||
| 493 | 498 | * or {@link handleRequest()}, but in some based we want to set it manually. |
| 494 | 499 | * |
| 495 | 500 | * @param SS_HTTPRequest |
| 501 | + * @param SS_HTTPRequest $request |
|
| 496 | 502 | */ |
| 497 | 503 | public function setRequest($request) { |
| 498 | 504 | $this->request = $request; |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * |
| 249 | 249 | * @param array $args Array of input shortcode arguments |
| 250 | 250 | * @param int $errorCode If the file is not found, or is inaccessible, this will be assigned to a HTTP error code. |
| 251 | - * @return File|null The File DataObject, if it can be found. |
|
| 251 | + * @return null|DataObject The File DataObject, if it can be found. |
|
| 252 | 252 | */ |
| 253 | 253 | public static function find_shortcode_record($args, &$errorCode = null) { |
| 254 | 254 | // Validate shortcode |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | * |
| 618 | 618 | * @param string $condition The PHP condition to be evaluated. The page will be called $item |
| 619 | 619 | * @param array $collator An array, passed by reference, to collect all of the matching descendants. |
| 620 | - * @return true|null |
|
| 620 | + * @return boolean|null |
|
| 621 | 621 | */ |
| 622 | 622 | public function collateDescendants($condition, &$collator) { |
| 623 | 623 | if($children = $this->Children()) { |
@@ -978,6 +978,7 @@ discard block |
||
| 978 | 978 | * |
| 979 | 979 | * @param String File extension, without dot prefix. Use an asterisk ('*') |
| 980 | 980 | * to specify a generic fallback if no mapping is found for an extension. |
| 981 | + * @param string $ext |
|
| 981 | 982 | * @return String Classname for a subclass of {@link File} |
| 982 | 983 | */ |
| 983 | 984 | public static function get_class_for_file_extension($ext) { |
@@ -1115,7 +1116,6 @@ discard block |
||
| 1115 | 1116 | * Note that the result will not have a leading slash, and should not be used |
| 1116 | 1117 | * with local file paths. |
| 1117 | 1118 | * |
| 1118 | - * @param string $part,... Parts |
|
| 1119 | 1119 | * @return string |
| 1120 | 1120 | */ |
| 1121 | 1121 | public static function join_paths() { |