@@ -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; |
@@ -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) { |
@@ -27,6 +27,9 @@ |
||
27 | 27 | return $this->can(__FUNCTION__, $member, $context); |
28 | 28 | } |
29 | 29 | |
30 | + /** |
|
31 | + * @param string $perm |
|
32 | + */ |
|
30 | 33 | public function can($perm, $member = null, $context = array()) { |
31 | 34 | $perms = [ |
32 | 35 | "PERM_{$perm}", |
@@ -139,6 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | /** |
141 | 141 | * Set the manifest to be used to look up test classes by helper functions |
142 | + * @param SS_ClassManifest $manifest |
|
142 | 143 | */ |
143 | 144 | public static function set_test_class_manifest($manifest) { |
144 | 145 | self::$test_class_manifest = $manifest; |
@@ -422,7 +423,7 @@ discard block |
||
422 | 423 | * Will collate all IDs form all fixtures if multiple fixtures are provided. |
423 | 424 | * |
424 | 425 | * @param string $className |
425 | - * @return array A map of fixture-identifier => object-id |
|
426 | + * @return A A map of fixture-identifier => object-id |
|
426 | 427 | */ |
427 | 428 | protected function allFixtureIDs($className) { |
428 | 429 | return $this->getFixtureFactory()->getIds($className); |
@@ -582,10 +583,10 @@ discard block |
||
582 | 583 | /** |
583 | 584 | * Assert that the matching email was sent since the last call to clearEmails() |
584 | 585 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
585 | - * @param $to |
|
586 | + * @param string $to |
|
586 | 587 | * @param $from |
587 | - * @param $subject |
|
588 | - * @param $content |
|
588 | + * @param string $subject |
|
589 | + * @param string $content |
|
589 | 590 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
590 | 591 | * 'customHeaders', 'htmlContent', inlineImages' |
591 | 592 | */ |
@@ -753,7 +754,7 @@ discard block |
||
753 | 754 | * @param string $expectedSQL |
754 | 755 | * @param string $actualSQL |
755 | 756 | * @param string $message |
756 | - * @param float $delta |
|
757 | + * @param integer $delta |
|
757 | 758 | * @param integer $maxDepth |
758 | 759 | * @param boolean $canonicalize |
759 | 760 | * @param boolean $ignoreCase |
@@ -1039,9 +1040,9 @@ discard block |
||
1039 | 1040 | /** |
1040 | 1041 | * Test against a theme. |
1041 | 1042 | * |
1042 | - * @param $themeBaseDir string - themes directory |
|
1043 | - * @param $theme string - theme name |
|
1044 | - * @param $callback Closure |
|
1043 | + * @param string $themeBaseDir string - themes directory |
|
1044 | + * @param string $theme string - theme name |
|
1045 | + * @param Closure $callback Closure |
|
1045 | 1046 | */ |
1046 | 1047 | protected function useTestTheme($themeBaseDir, $theme, $callback) { |
1047 | 1048 | Config::nest(); |
@@ -23,8 +23,6 @@ |
||
23 | 23 | * $list = DataList::create('SiteTree'); |
24 | 24 | * $list = SiteTree::get(); |
25 | 25 | * |
26 | - * @param string $class the class name |
|
27 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
28 | 26 | * @return static |
29 | 27 | */ |
30 | 28 | public static function create() { |
@@ -192,7 +192,7 @@ |
||
192 | 192 | * |
193 | 193 | * @todo refactor this into GridFieldComponent |
194 | 194 | * |
195 | - * @param mixed $value |
|
195 | + * @param string $value |
|
196 | 196 | * @param string|array $castingDefinition |
197 | 197 | * |
198 | 198 | * @return mixed |
@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\Framework\Test\Behaviour; |
4 | 4 | |
5 | -use Behat\Behat\Context\BehatContext, |
|
6 | - Behat\Behat\Context\Step, |
|
7 | - Behat\Behat\Event\StepEvent, |
|
8 | - Behat\Mink\Element\NodeElement, |
|
9 | - Behat\Mink\Session; |
|
5 | +use Behat\Behat\Context\BehatContext; |
|
6 | +use Behat\Behat\Context\Step; |
|
7 | +use Behat\Behat\Event\StepEvent; |
|
8 | +use Behat\Mink\Element\NodeElement; |
|
9 | +use Behat\Mink\Session; |
|
10 | 10 | |
11 | 11 | |
12 | 12 | /** |