@@ -6,11 +6,9 @@ |
||
| 6 | 6 | /** @skipUpgrade */ |
| 7 | 7 | use SilverStripe\Admin\ModelAdmin; |
| 8 | 8 | /** @skipUpgrade */ |
| 9 | -use SilverStripe\Control\Controller as Cont ; |
|
| 10 | 9 | /** @skipUpgrade */ |
| 11 | -use SilverStripe\Control\HTTPRequest as Request, SilverStripe\Control\HTTPResponse as Response, SilverStripe\Security\PermissionProvider as P; |
|
| 10 | +use SilverStripe\Security\PermissionProvider as P; |
|
| 12 | 11 | /** @skipUpgrade */ |
| 13 | -use silverstripe\test\ClassA; |
|
| 14 | 12 | /** @skipUpgrade */ |
| 15 | 13 | use \SilverStripe\Core\ClassInfo; |
| 16 | 14 | |
@@ -8,10 +8,8 @@ |
||
| 8 | 8 | use SilverStripe\Forms\Tests\GridField\GridFieldTest\Team; |
| 9 | 9 | use SilverStripe\ORM\ArrayList; |
| 10 | 10 | use SilverStripe\ORM\DataList; |
| 11 | -use SilverStripe\Security\Member; |
|
| 12 | 11 | use SilverStripe\Dev\CSSContentParser; |
| 13 | 12 | use SilverStripe\Dev\SapphireTest; |
| 14 | -use SilverStripe\Control\Controller; |
|
| 15 | 13 | use SilverStripe\Forms\FieldList; |
| 16 | 14 | use SilverStripe\Forms\Form; |
| 17 | 15 | use SilverStripe\Forms\GridField\GridFieldConfig; |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | * |
| 373 | 373 | * @param string $property |
| 374 | 374 | * the name of the property |
| 375 | - * @param object $object |
|
| 375 | + * @param string $object |
|
| 376 | 376 | * the object to be set |
| 377 | 377 | * @return $this |
| 378 | 378 | */ |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | * The name of the service to update the definition for |
| 468 | 468 | * @param string $property |
| 469 | 469 | * The name of the property to update. |
| 470 | - * @param mixed $value |
|
| 470 | + * @param string $value |
|
| 471 | 471 | * The value to set |
| 472 | 472 | * @param boolean $append |
| 473 | 473 | * Whether to append (the default) when the property is an array |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | /** |
| 790 | 790 | * @deprecated 4.0.0:5.0.0 Use Injector::has() instead |
| 791 | 791 | * @param $name |
| 792 | - * @return string |
|
| 792 | + * @return boolean |
|
| 793 | 793 | */ |
| 794 | 794 | public function hasService($name) |
| 795 | 795 | { |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | * - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full |
| 332 | 332 | * control over the index. |
| 333 | 333 | * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type |
| 334 | - * @param array $options Create table options (ENGINE, etc.) |
|
| 334 | + * @param string|null $options Create table options (ENGINE, etc.) |
|
| 335 | 335 | * @param array|bool $extensions List of extensions |
| 336 | 336 | */ |
| 337 | 337 | public function requireTable( |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | * |
| 596 | 596 | * @param string $table The table name. |
| 597 | 597 | * @param string $field The field name. |
| 598 | - * @param array|string $spec The field specification. If passed in array syntax, the specific database |
|
| 598 | + * @param string $spec The field specification. If passed in array syntax, the specific database |
|
| 599 | 599 | * driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to |
| 600 | 600 | * be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll |
| 601 | 601 | * need to take care of database abstraction in your DBField subclass. |
@@ -488,7 +488,7 @@ |
||
| 488 | 488 | * Cache all indexes for the given class. |
| 489 | 489 | * Will do nothing if already cached |
| 490 | 490 | * |
| 491 | - * @param $class |
|
| 491 | + * @param string $class |
|
| 492 | 492 | */ |
| 493 | 493 | protected function cacheDatabaseIndexes($class) |
| 494 | 494 | { |
@@ -4,9 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Assets\File; |
| 6 | 6 | use SilverStripe\CMS\Model\SiteTree; |
| 7 | -use SilverStripe\Core\Config\Config; |
|
| 8 | 7 | use SilverStripe\CMS\Controllers\ContentController; |
| 9 | -use SilverStripe\ORM\Connect\MySQLSchemaManager; |
|
| 10 | 8 | use SilverStripe\ORM\DataExtension; |
| 11 | 9 | use Exception; |
| 12 | 10 | |
@@ -2,13 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Security\MemberAuthenticator; |
| 4 | 4 | |
| 5 | -use SilverStripe\Control\Cookie; |
|
| 6 | 5 | use SilverStripe\Control\RequestHandler; |
| 7 | -use SilverStripe\Control\Session; |
|
| 8 | 6 | use SilverStripe\Core\Injector\Injector; |
| 9 | 7 | use SilverStripe\Security\IdentityStore; |
| 10 | 8 | use SilverStripe\Security\Member; |
| 11 | -use SilverStripe\Security\RememberLoginHash; |
|
| 12 | 9 | use SilverStripe\Security\Security; |
| 13 | 10 | |
| 14 | 11 | /** |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | * Find an attribute in a SimpleXMLElement object by name. |
| 231 | 231 | * @param SimpleXMLElement $object |
| 232 | 232 | * @param string $attribute Name of attribute to find |
| 233 | - * @return SimpleXMLElement object of the attribute |
|
| 233 | + * @return boolean object of the attribute |
|
| 234 | 234 | */ |
| 235 | 235 | public function findAttribute($object, $attribute) |
| 236 | 236 | { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | * Note: characters are stripped from the content; make sure that your assertions take this into account. |
| 265 | 265 | * |
| 266 | 266 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
| 267 | - * @param array|string $expectedMatches The content of at least one of the matched tags |
|
| 267 | + * @param string[] $expectedMatches The content of at least one of the matched tags |
|
| 268 | 268 | * @param string $message |
| 269 | 269 | * @throws PHPUnit_Framework_AssertionFailedError |
| 270 | 270 | */ |
@@ -424,6 +424,9 @@ discard block |
||
| 424 | 424 | Security::setCurrentUser(null); |
| 425 | 425 | } |
| 426 | 426 | |
| 427 | + /** |
|
| 428 | + * @param DataObject|null $member |
|
| 429 | + */ |
|
| 427 | 430 | public function logIn($member) |
| 428 | 431 | { |
| 429 | 432 | Security::setCurrentUser($member); |
@@ -10,8 +10,6 @@ |
||
| 10 | 10 | use SilverStripe\Core\Config\Config; |
| 11 | 11 | use SilverStripe\Core\Config\Configurable; |
| 12 | 12 | use SilverStripe\Dev\SapphireTest; |
| 13 | -use SilverStripe\Core\Injector\Injector; |
|
| 14 | - |
|
| 15 | 13 | use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; |
| 16 | 14 | |
| 17 | 15 | /** |