Merge pull request #9707 from robbieaverill/pulls/4.7/exceptions

docs/en/02_Developer_Guides/00_Model/05_Extending_DataObjects.md

@@ -27,7 +27,7 @@ use SilverStripe\ORM\DataObject;
 class Player extends DataObject 
 {
     private static $has_many = [
-        "Teams" => "Team",
+        'Teams' => 'Team',
     ];
     
     public function onBeforeWrite() 
@@ -37,15 +37,13 @@ class Player extends DataObject
             $currentPlayer = Security::getCurrentUser();
         
             if (!$currentPlayer->IsTeamManager()) {
-                user_error('Player-creation not allowed', E_USER_ERROR);
+                throw new \Exception('Player-creation not allowed');
-                exit();
             }
         }
         
         // check on every write action
         if (!$this->record['TeamID']) {
-            user_error('Cannot save player without a valid team', E_USER_ERROR);
+            throw new \Exception('Cannot save player without a valid team');
-            exit();
         }
         
         // CAUTION: You are required to call the parent-function, otherwise

docs/en/02_Developer_Guides/07_Debugging/01_Error_Handling.md

@@ -115,7 +115,8 @@ developers know:
     * Things that will prevent an internal function from continuing.  Throw a warning and return null.
 
 *  **E_USER_ERROR:** Throwing one of these errors is going to take down the production site.  So you should only throw
-E_USER_ERROR if it's going to be **dangerous** or **impossible** to continue with the request.
+E_USER_ERROR if it's going to be **dangerous** or **impossible** to continue with the request. Note that it is
+preferable to now throw exceptions instead of `E_USER_ERROR`.
 
 ## Configuring error logging
 

src/Control/Controller.php

@@ -199,7 +199,7 @@ class Controller extends RequestHandler implements TemplateGlobalProvider
     public function handleRequest(HTTPRequest $request)
     {
         if (!$request) {
-            user_error("Controller::handleRequest() not passed a request!", E_USER_ERROR);
+            throw new \RuntimeException('Controller::handleRequest() not passed a request!');
         }
 
         //set up the controller for the incoming request

src/Control/HTTPRequest.php

@@ -858,7 +858,7 @@ class HTTPRequest implements ArrayAccess
     public function setHttpMethod($method)
     {
         if (!self::isValidHttpMethod($method)) {
-            user_error('HTTPRequest::setHttpMethod: Invalid HTTP method', E_USER_ERROR);
+            throw new \InvalidArgumentException('HTTPRequest::setHttpMethod: Invalid HTTP method');
         }
 
         $this->httpMethod = strtoupper($method);
@@ -912,12 +912,11 @@ class HTTPRequest implements ArrayAccess
     {
         if (isset($postVars['_method'])) {
             if (!self::isValidHttpMethod($postVars['_method'])) {
-                user_error('HTTPRequest::detect_method(): Invalid "_method" parameter', E_USER_ERROR);
+                throw new InvalidArgumentException('HTTPRequest::detect_method(): Invalid "_method" parameter');
             }
             return strtoupper($postVars['_method']);
-        } else {
-            return $origMethod;
         }
+        return $origMethod;
     }
 
     /**

src/Control/RequestHandler.php

@@ -187,7 +187,7 @@ class RequestHandler extends ViewableData
             }
             $action = "index";
         } elseif (!is_string($action)) {
-            user_error("Non-string method name: " . var_export($action, true), E_USER_ERROR);
+            throw new InvalidArgumentException("Non-string method name: " . var_export($action, true));
         }
 
         $classMessage = Director::isLive() ? 'on this handler' : 'on class ' . static::class;

src/Core/Extensible.php

@@ -183,17 +183,17 @@ trait Extensible
         }
         $extensionClass = $matches[1];
         if (!class_exists($extensionClass)) {
-            user_error(
+            throw new InvalidArgumentException(sprintf(
-                sprintf('Object::add_extension() - Can\'t find extension class for "%s"', $extensionClass),
+                'Object::add_extension() - Can\'t find extension class for "%s"',
-                E_USER_ERROR
+                $extensionClass
-            );
+            ));
         }
 
-        if (!is_subclass_of($extensionClass, 'SilverStripe\\Core\\Extension')) {
+        if (!is_subclass_of($extensionClass, Extension::class)) {
-            user_error(
+            throw new InvalidArgumentException(sprintf(
-                sprintf('Object::add_extension() - Extension "%s" is not a subclass of Extension', $extensionClass),
+                'Object::add_extension() - Extension "%s" is not a subclass of Extension',
-                E_USER_ERROR
+                $extensionClass
-            );
+            ));
         }
 
         // unset some caches
@@ -334,7 +334,7 @@ trait Extensible
         $sources = [];
 
         foreach ($extensions as $extension) {
-            list($extensionClass, $extensionArgs) = ClassInfo::parse_class_spec($extension);
+            [$extensionClass, $extensionArgs] = ClassInfo::parse_class_spec($extension);
             // Strip service name specifier
             $extensionClass = strtok($extensionClass, '.');
             $sources[] = $extensionClass;

src/Dev/CsvBulkLoader.php

@@ -344,7 +344,7 @@ class CsvBulkLoader extends BulkLoader
                 }
             } elseif (strpos($fieldName, '.') !== false) {
                 // we have a relation column with dot notation
-                list($relationName, $columnName) = explode('.', $fieldName);
+                [$relationName, $columnName] = explode('.', $fieldName);
                 // always gives us an component (either empty or existing)
                 $relationObj = $obj->getComponent($relationName);
                 if (!$preview) {
@@ -445,15 +445,19 @@ class CsvBulkLoader extends BulkLoader
                 } elseif ($SNG_objectClass->hasMethod($duplicateCheck['callback'])) {
                     $existingRecord = $SNG_objectClass->{$duplicateCheck['callback']}($record[$fieldName], $record);
                 } else {
-                    user_error("CsvBulkLoader::processRecord():"
+                    throw new \RuntimeException(
-                        . " {$duplicateCheck['callback']} not found on importer or object class.", E_USER_ERROR);
+                        "CsvBulkLoader::processRecord():"
+                        . " {$duplicateCheck['callback']} not found on importer or object class."
+                    );
                 }
 
                 if ($existingRecord) {
                     return $existingRecord;
                 }
             } else {
-                user_error('CsvBulkLoader::processRecord(): Wrong format for $duplicateChecks', E_USER_ERROR);
+                throw new \InvalidArgumentException(
+                    'CsvBulkLoader::processRecord(): Wrong format for $duplicateChecks'
+                );
             }
         }
 

src/Dev/SapphireTest.php

@@ -480,11 +480,11 @@ class SapphireTest extends PHPUnit_Framework_TestCase implements TestOnly
         $id = $state->getFixtureFactory(static::class)->getId($className, $identifier);
 
         if (!$id) {
-            user_error(sprintf(
+            throw new \InvalidArgumentException(sprintf(
                 "Couldn't find object '%s' (class: %s)",
                 $identifier,
                 $className
-            ), E_USER_ERROR);
+            ));
         }
 
         return $id;
@@ -519,11 +519,11 @@ class SapphireTest extends PHPUnit_Framework_TestCase implements TestOnly
         $obj = $state->getFixtureFactory(static::class)->get($className, $identifier);
 
         if (!$obj) {
-            user_error(sprintf(
+            throw new \InvalidArgumentException(sprintf(
                 "Couldn't find object '%s' (class: %s)",
                 $identifier,
                 $className
-            ), E_USER_ERROR);
+            ));
         }
 
         return $obj;

src/Forms/CompositeField.php

@@ -251,11 +251,10 @@ class CompositeField extends FormField
                     if (isset($list[$name])) {
                         $fieldClass = get_class($field);
                         $otherFieldClass = get_class($list[$name]);
-                        user_error(
+                        throw new \RuntimeException(
                             "collateDataFields() I noticed that a field called '$name' appears twice in"
                              . " your form: '{$formName}'.  One is a '{$fieldClass}' and the other is a"
-                             . " '{$otherFieldClass}'",
+                             . " '{$otherFieldClass}'"
-                            E_USER_ERROR
                         );
                     }
                     $list[$name] = $field;

src/Forms/FieldList.php

@@ -165,15 +165,12 @@ class FieldList extends ArrayList
             $errorSuffix = '';
         }
 
-        user_error(
+        throw new \RuntimeException(sprintf(
-            sprintf(
             "%s() I noticed that a field called '%s' appears twice%s",
             $functionName,
             $field->getName(),
             $errorSuffix
-            ),
+        ));
-            E_USER_ERROR
-        );
     }
 
     protected function flushFieldsCache()
@@ -213,9 +210,8 @@ class FieldList extends ArrayList
                     } else {
                         $errSuffix = '';
                     }
-                    user_error(
+                    throw new \RuntimeException(
-                        "collateDataFields() I noticed that a field called '$name' appears twice$errSuffix.",
+                        "collateDataFields() I noticed that a field called '$name' appears twice$errSuffix."
-                        E_USER_ERROR
                     );
                 }
                 $list[$name] = $field;
@@ -493,10 +489,9 @@ class FieldList extends ArrayList
                         ? " named '{$parentPointer->getName()}'"
                         : null;
                     $parentPointerClass = get_class($parentPointer);
-                    user_error(
+                    throw new \InvalidArgumentException(
                         "FieldList::addFieldToTab() Tried to add a tab to object"
-                        . " '{$parentPointerClass}'{$withName} - '{$part}' didn't exist.",
+                        . " '{$parentPointerClass}'{$withName} - '{$part}' didn't exist."
-                        E_USER_ERROR
                     );
                 }
             }

src/Forms/FormField.php

@@ -1414,12 +1414,7 @@ class FormField extends RequestHandler
         }
 
         $class = static::class;
-        user_error(
+        throw new \RuntimeException("rootFieldList() called on {$class} object without a containerFieldList");
-            "rootFieldList() called on {$class} object without a containerFieldList",
-            E_USER_ERROR
-        );
-
-        return null;
     }
 
     /**

src/Forms/SelectField.php

@@ -173,7 +173,7 @@ abstract class SelectField extends FormField
             $source = $source->toArray();
         }
         if (!is_array($source) && !($source instanceof ArrayAccess)) {
-            user_error('$source passed in as invalid type', E_USER_ERROR);
+            throw new \InvalidArgumentException('$source passed in as invalid type');
         }
 
         return $source;

src/Forms/TreeMultiselectField.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Forms;
 
+use http\Exception\InvalidArgumentException;
 use SilverStripe\Control\Controller;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\ArrayList;
@@ -252,10 +253,9 @@ class TreeMultiselectField extends TreeDropdownField
         $saveDest = $record->$fieldName();
         if (!$saveDest) {
             $recordClass = get_class($record);
-            user_error(
+            throw new \RuntimeException(
                 "TreeMultiselectField::saveInto() Field '$fieldName' not found on"
-                . " {$recordClass}.{$record->ID}",
+                . " {$recordClass}.{$record->ID}"
-                E_USER_ERROR
             );
         }
 

src/ORM/Connect/Database.php

@@ -431,9 +431,8 @@ abstract class Database
                     break;
 
                 default:
-                    user_error(
+                    throw new \InvalidArgumentException(
-                        "SS_Database::manipulate() Can't recognise command '{$writeInfo['command']}'",
+                        "SS_Database::manipulate() Can't recognise command '{$writeInfo['command']}'"
-                        E_USER_ERROR
                     );
             }
         }

src/ORM/Connect/MySQLiConnector.php

@@ -2,9 +2,9 @@
 
 namespace SilverStripe\ORM\Connect;
 
-use SilverStripe\Core\Config\Config;
 use mysqli;
 use mysqli_stmt;
+use SilverStripe\Core\Config\Config;
 
 /**
  * Connector for MySQL using the MySQLi method
@@ -238,11 +238,9 @@ class MySQLiConnector extends DBConnector
                 case 'array':
                 case 'unknown type':
                 default:
-                    user_error(
+                    throw new \InvalidArgumentException(
-                        "Cannot bind parameter \"$value\" as it is an unsupported type ($phpType)",
+                        "Cannot bind parameter \"$value\" as it is an unsupported type ($phpType)"
-                        E_USER_ERROR
                     );
-                    break;
             }
             $values[] = $value;
         }

src/ORM/DataList.php

@@ -1274,7 +1274,7 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
      */
     public function offsetSet($key, $value)
     {
-        user_error("Can't alter items in a DataList using array-access", E_USER_ERROR);
+        throw new \BadMethodCallException("Can't alter items in a DataList using array-access");
     }
 
     /**
@@ -1284,6 +1284,6 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
      */
     public function offsetUnset($key)
     {
-        user_error("Can't alter items in a DataList using array-access", E_USER_ERROR);
+        throw new \BadMethodCallException("Can't alter items in a DataList using array-access");
     }
 }

src/ORM/DataObject.php

@@ -1391,8 +1391,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
         $this->brokenOnWrite = true;
         $this->onBeforeWrite();
         if ($this->brokenOnWrite) {
-            user_error(static::class . " has a broken onBeforeWrite() function."
+            throw new LogicException(
-                . " Make sure that you call parent::onBeforeWrite().", E_USER_ERROR);
+                static::class . " has a broken onBeforeWrite() function."
+                . " Make sure that you call parent::onBeforeWrite()."
+            );
         }
     }
 
@@ -1737,8 +1739,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
         $this->brokenOnDelete = true;
         $this->onBeforeDelete();
         if ($this->brokenOnDelete) {
-            user_error(static::class . " has a broken onBeforeDelete() function."
+            throw new LogicException(
-                . " Make sure that you call parent::onBeforeDelete().", E_USER_ERROR);
+                static::class . " has a broken onBeforeDelete() function."
+                . " Make sure that you call parent::onBeforeDelete()."
+            );
         }
 
         // Deleting a record without an ID shouldn't do anything
@@ -2874,7 +2878,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
     public function setCastedField($fieldName, $value)
     {
         if (!$fieldName) {
-            user_error("DataObject::setCastedField: Called without a fieldName", E_USER_ERROR);
+            throw new InvalidArgumentException("DataObject::setCastedField: Called without a fieldName");
         }
         $fieldObj = $this->dbObject($fieldName);
         if ($fieldObj) {

src/ORM/FieldType/DBBoolean.php

@@ -35,7 +35,7 @@ class DBBoolean extends DBField
 
     public function Nice()
     {
-        return ($this->value) ? _t('SilverStripe\\ORM\\FieldType\\DBBoolean.YESANSWER', 'Yes') : _t('SilverStripe\\ORM\\FieldType\\DBBoolean.NOANSWER', 'No');
+        return ($this->value) ? _t(__CLASS__ . '.YESANSWER', 'Yes') : _t(__CLASS__ . '.NOANSWER', 'No');
     }
 
     public function NiceAsBoolean()
@@ -50,7 +50,7 @@ class DBBoolean extends DBField
             $dataObject->$fieldName = ($this->value) ? 1 : 0;
         } else {
             $class = static::class;
-            user_error("DBField::saveInto() Called on a nameless '$class' object", E_USER_ERROR);
+            throw new \RuntimeException("DBField::saveInto() Called on a nameless '$class' object");
         }
     }
 
@@ -61,10 +61,10 @@ class DBBoolean extends DBField
 
     public function scaffoldSearchField($title = null)
     {
-        $anyText = _t('SilverStripe\\ORM\\FieldType\\DBBoolean.ANY', 'Any');
+        $anyText = _t(__CLASS__ . '.ANY', 'Any');
         $source = [
-            1 => _t('SilverStripe\\ORM\\FieldType\\DBBoolean.YESANSWER', 'Yes'),
+            1 => _t(__CLASS__ . '.YESANSWER', 'Yes'),
-            0 => _t('SilverStripe\\ORM\\FieldType\\DBBoolean.NOANSWER', 'No')
+            0 => _t(__CLASS__ . '.NOANSWER', 'No')
         ];
 
         $field = new DropdownField($this->name, $title, $source);

src/ORM/FieldType/DBDecimal.php

@@ -90,7 +90,9 @@ class DBDecimal extends DBField
         if ($fieldName) {
             $dataObject->$fieldName = (float)preg_replace('/[^0-9.\-\+]/', '', $this->value);
         } else {
-            user_error("DBField::saveInto() Called on a nameless '" . static::class . "' object", E_USER_ERROR);
+            throw new \UnexpectedValueException(
+                "DBField::saveInto() Called on a nameless '" . static::class . "' object"
+            );
         }
     }
 

src/ORM/FieldType/DBEnum.php

@@ -5,6 +5,7 @@ namespace SilverStripe\ORM\FieldType;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\ORM\ArrayLib;
+use SilverStripe\ORM\Connect\MySQLDatabase;
 use SilverStripe\ORM\DB;
 
 /**
@@ -77,9 +78,8 @@ class DBEnum extends DBString
                 if (in_array($default, $enum)) {
                     $this->setDefault($default);
                 } else {
-                    user_error(
+                    throw new \InvalidArgumentException(
-                        "Enum::__construct() The default value '$default' does not match any item in the enumeration",
+                        "Enum::__construct() The default value '$default' does not match any item in the enumeration"
-                        E_USER_ERROR
                     );
                 }
             } elseif (is_int($default) && $default < count($enum)) {
@@ -99,8 +99,8 @@ class DBEnum extends DBString
      */
     public function requireField()
     {
-        $charset = Config::inst()->get('SilverStripe\ORM\Connect\MySQLDatabase', 'charset');
+        $charset = Config::inst()->get(MySQLDatabase::class, 'charset');
-        $collation = Config::inst()->get('SilverStripe\ORM\Connect\MySQLDatabase', 'collation');
+        $collation = Config::inst()->get(MySQLDatabase::class, 'collation');
 
         $parts = [
             'datatype' => 'enum',

src/ORM/FieldType/DBMultiEnum.php

@@ -3,6 +3,7 @@
 namespace SilverStripe\ORM\FieldType;
 
 use SilverStripe\Core\Config\Config;
+use SilverStripe\ORM\Connect\MySQLDatabase;
 use SilverStripe\ORM\DB;
 use SilverStripe\Forms\CheckboxSetField;
 
@@ -22,9 +23,10 @@ class DBMultiEnum extends DBEnum
             $defaults = preg_split('/ *, */', trim($default));
             foreach ($defaults as $thisDefault) {
                 if (!in_array($thisDefault, $this->enum)) {
-                    user_error("Enum::__construct() The default value '$thisDefault' does not match "
+                    throw new \InvalidArgumentException(
-                        . "any item in the enumeration", E_USER_ERROR);
+                        "Enum::__construct() The default value '$thisDefault' does not match "
-                    return;
+                        . "any item in the enumeration"
+                    );
                 }
             }
             $this->default = implode(',', $defaults);
@@ -34,8 +36,8 @@ class DBMultiEnum extends DBEnum
     public function requireField()
     {
         // @todo: Remove mysql-centric logic from this
-        $charset = Config::inst()->get('SilverStripe\ORM\Connect\MySQLDatabase', 'charset');
+        $charset = Config::inst()->get(MySQLDatabase::class, 'charset');
-        $collation = Config::inst()->get('SilverStripe\ORM\Connect\MySQLDatabase', 'collation');
+        $collation = Config::inst()->get(MySQLDatabase::class, 'collation');
         $values=[
             'type'=>'set',
             'parts'=>[

src/ORM/HasManyList.php

@@ -74,7 +74,7 @@ class HasManyList extends RelationList
         if (is_numeric($item)) {
             $item = DataObject::get_by_id($this->dataClass, $item);
         } elseif (!($item instanceof $this->dataClass)) {
-            user_error("HasManyList::add() expecting a $this->dataClass object, or ID value", E_USER_ERROR);
+            throw new InvalidArgumentException("HasManyList::add() expecting a $this->dataClass object, or ID value");
         }
 
         $foreignID = $this->getForeignID();
@@ -123,10 +123,7 @@ class HasManyList extends RelationList
     public function remove($item)
     {
         if (!($item instanceof $this->dataClass)) {
-            throw new InvalidArgumentException(
+            throw new InvalidArgumentException("HasManyList::remove() expecting a $this->dataClass object, or ID");
-                "HasManyList::remove() expecting a $this->dataClass object, or ID",
-                E_USER_ERROR
-            );
         }
 
         // Don't remove item which doesn't belong to this list

src/ORM/Hierarchy/Hierarchy.php

@@ -368,9 +368,8 @@ class Hierarchy extends DataExtension
             // Validate the ID list
             foreach ($idList as $id) {
                 if (!is_numeric($id)) {
-                    user_error(
+                    throw new \InvalidArgumentException(
-                        "Bad ID passed to Versioned::prepopulate_numchildren_cache() in \$idList: " . $id,
+                        "Bad ID passed to Versioned::prepopulate_numchildren_cache() in \$idList: " . $id
-                        E_USER_ERROR
                     );
                 }
             }

src/ORM/Map.php

@@ -212,10 +212,7 @@ class Map implements ArrayAccess, Countable, IteratorAggregate
             $this->lastItems[$key] = $value;
         }
 
-        user_error(
+        throw new \BadMethodCallException('Map is read-only. Please use $map->push($key, $value) to append values');
-            'Map is read-only. Please use $map->push($key, $value) to append values',
-            E_USER_ERROR
-        );
     }
 
     /**
@@ -243,9 +240,8 @@ class Map implements ArrayAccess, Countable, IteratorAggregate
             return;
         }
 
-        user_error(
+        throw new \BadMethodCallException(
-            "Map is read-only. Unset cannot be called on keys derived from the DataQuery",
+            'Map is read-only. Unset cannot be called on keys derived from the DataQuery'
-            E_USER_ERROR
         );
     }
 

src/ORM/PolymorphicHasManyList.php

@@ -109,8 +109,7 @@ class PolymorphicHasManyList extends HasManyList
     {
         if (!($item instanceof $this->dataClass)) {
             throw new InvalidArgumentException(
-                "HasManyList::remove() expecting a $this->dataClass object, or ID",
+                "HasManyList::remove() expecting a $this->dataClass object, or ID"
-                E_USER_ERROR
             );
         }
 

src/ORM/Queries/SQLConditionalExpression.php

@@ -612,9 +612,8 @@ abstract class SQLConditionalExpression extends SQLExpression
                 if ($parameterCount === 1) {
                     $key .= " = ?";
                 } elseif ($parameterCount > 1) {
-                    user_error(
+                    throw new \InvalidArgumentException(
-                        "Incorrect number of '?' in predicate $key. Expected $parameterCount but none given.",
+                        "Incorrect number of '?' in predicate $key. Expected $parameterCount but none given."
-                        E_USER_ERROR
                     );
                 }
             }
@@ -622,9 +621,11 @@ abstract class SQLConditionalExpression extends SQLExpression
         } elseif (is_array($value)) {
             // If predicates are nested one per array (as per the internal format)
             // then run a quick check over the contents and recursively parse
-            if (count($value) != 1) {
+            if (count($value) !== 1) {
-                user_error('Nested predicates should be given as a single item array in '
+                throw new \InvalidArgumentException(
-                        . 'array($predicate => array($prameters)) format)', E_USER_ERROR);
+                    'Nested predicates should be given as a single item array in '
+                        . 'array($predicate => array($prameters)) format)'
+                );
             }
             foreach ($value as $key => $pairValue) {
                 return $this->parsePredicate($key, $pairValue);

src/ORM/UnsavedRelationList.php

@@ -95,10 +95,10 @@ class UnsavedRelationList extends ArrayList implements Relation
     public function push($item, $extraFields = null)
     {
         if ((is_object($item) && !$item instanceof $this->dataClass)
-            || (!is_object($item) && !is_numeric($item))) {
+            || (!is_object($item) && !is_numeric($item))
+        ) {
             throw new InvalidArgumentException(
-                "UnsavedRelationList::add() expecting a $this->dataClass object, or ID value",
+                "UnsavedRelationList::add() expecting a $this->dataClass object, or ID value"
-                E_USER_ERROR
             );
         }
         if (is_object($item) && $item->ID) {

src/Security/Member_GroupSet.php

@@ -19,7 +19,7 @@ class Member_GroupSet extends ManyManyList
     {
         // Do not join the table directly
         if ($this->extraFields) {
-            user_error('Member_GroupSet does not support many_many_extraFields', E_USER_ERROR);
+            throw new \BadMethodCallException('Member_GroupSet does not support many_many_extraFields');
         }
     }
 

src/Security/Permission.php

@@ -246,7 +246,7 @@ class Permission extends DataObject implements TemplateGlobalProvider, Resettabl
                     $argClause = "AND \"Arg\" IN (?, ?) ";
                     $argParams = [-1, $arg];
                 } else {
-                    user_error("Permission::checkMember: bad arg '$arg'", E_USER_ERROR);
+                    throw new \InvalidArgumentException("Permission::checkMember: bad arg '$arg'");
                 }
         }
 
@@ -408,10 +408,7 @@ class Permission extends DataObject implements TemplateGlobalProvider, Resettabl
                 if (is_numeric($arg)) {
                     $perm->Arg = $arg;
                 } else {
-                    user_error(
+                    throw new \InvalidArgumentException("Permission::checkMember: bad arg '$arg'");
-                        "Permission::checkMember: bad arg '$arg'",
-                        E_USER_ERROR
-                    );
                 }
         }
 
@@ -446,10 +443,7 @@ class Permission extends DataObject implements TemplateGlobalProvider, Resettabl
                 if (is_numeric($arg)) {
                     $perm->Arg = $arg;
                 } else {
-                    user_error(
+                    throw new \InvalidArgumentException("Permission::checkMember: bad arg '$arg'");
-                        "Permission::checkMember: bad arg '$arg'",
-                        E_USER_ERROR
-                    );
                 }
         }
 

src/View/Parsers/ShortcodeParser.php

@@ -191,7 +191,7 @@ class ShortcodeParser
         // Missing tag
         if ($content === false) {
             if (ShortcodeParser::$error_behavior == ShortcodeParser::ERROR) {
-                user_error('Unknown shortcode tag ' . $tag['open'], E_USER_ERROR);
+                throw new \InvalidArgumentException('Unknown shortcode tag ' . $tag['open']);
             } elseif (self::$error_behavior == self::WARN && $isHTMLAllowed) {
                 $content = '<strong class="warning">' . $tag['text'] . '</strong>';
             } elseif (ShortcodeParser::$error_behavior == ShortcodeParser::STRIP) {
@@ -381,7 +381,7 @@ class ShortcodeParser
 
                 if ($err) {
                     if (self::$error_behavior == self::ERROR) {
-                        user_error($err, E_USER_ERROR);
+                        throw new \Exception($err);
                     }
                 } else {
                     if ($tags[$i]['escaped']) {
@@ -603,7 +603,7 @@ class ShortcodeParser
             }
             // NOP
         } else {
-            user_error('Unknown value for $location argument ' . $location, E_USER_ERROR);
+            throw new \UnexpectedValueException('Unknown value for $location argument ' . $location);
         }
     }
 
@@ -664,7 +664,7 @@ class ShortcodeParser
             // Now parse the result into a DOM
             if (!$htmlvalue->isValid()) {
                 if (self::$error_behavior == self::ERROR) {
-                    user_error('Couldn\'t decode HTML when processing short codes', E_USER_ERROR);
+                    throw new \Exception('Couldn\'t decode HTML when processing short codes');
                 } else {
                     $continue = false;
                 }
@@ -706,9 +706,8 @@ class ShortcodeParser
 
                 if (!$parent) {
                     if ($location !== self::INLINE) {
-                        user_error(
+                        throw new \RuntimeException(
-                            "Parent block for shortcode couldn't be found, but location wasn't INLINE",
+                            "Parent block for shortcode couldn't be found, but location wasn't INLINE"
-                            E_USER_ERROR
                         );
                     }
                 } else {

src/View/SSViewer_DataPresenter.php

@@ -249,7 +249,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope
             case 'Up':
                 $upIndex = $this->getUpIndex();
                 if ($upIndex === null) {
-                    user_error('Up called when we\'re already at the top of the scope', E_USER_ERROR);
+                    throw new \LogicException('Up called when we\'re already at the top of the scope');
                 }
 
                 $overlayIndex = $upIndex; // Parent scope

src/View/SSViewer_Scope.php

@@ -191,7 +191,7 @@ class SSViewer_Scope
         switch ($name) {
             case 'Up':
                 if ($this->upIndex === null) {
-                    user_error('Up called when we\'re already at the top of the scope', E_USER_ERROR);
+                    throw new \LogicException('Up called when we\'re already at the top of the scope');
                 }
 
                 list(

tests/php/Control/HTTPRequestTest.php

@@ -160,11 +160,9 @@ class HTTPRequestTest extends SapphireTest
         $this->assertEquals($expected, $actual);
     }
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
     public function testBadDetectMethod()
     {
+        $this->expectException(\InvalidArgumentException::class);
         HTTPRequest::detect_method('POST', ['_method' => 'Boom']);
     }
 
@@ -191,11 +189,9 @@ class HTTPRequestTest extends SapphireTest
         $this->assertEquals($request, $returnedRequest);
     }
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
     public function testBadSetHttpMethod()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $request = new HTTPRequest('GET', '/hello');
         $request->setHttpMethod('boom');
     }

tests/php/Forms/CompositeFieldTest.php

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Forms\Tests;
 
-use PHPUnit_Framework_Error;
 use SilverStripe\Dev\CSSContentParser;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\CompositeField;
@@ -161,12 +160,13 @@ class CompositeFieldTest extends SapphireTest
         $this->assertNull($result['title']);
     }
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     * @expectedExceptionMessageRegExp /a field called 'Test' appears twice in your form.*TextField.*TextField/
-     */
     public function testCollateDataFieldsThrowsErrorOnDuplicateChildren()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessageRegExp(
+            "/a field called 'Test' appears twice in your form.*TextField.*TextField/"
+        );
+
         $field = CompositeField::create(
             TextField::create('Test'),
             TextField::create('Test')