Simplify expect_type, by always throwing a TypeError.

In PHP 5, you must specify.

Author: jasny

README.md

@@ -70,8 +70,8 @@ Turn an `stdClass` object into an associated array recursively.
 
 Validate that an argument has a specific type. 
 
-By default a `TypeError` is thrown in PHP 7 and an [`InvalidArgumentException`](http://php.net/invalidargumentexception)
-is thrown in PHP 5. You can specify a class name for any `Throwable` class.
+By default a `TypeError` (PHP 7) is thrown. You can specify a class name for any `Throwable` class. For PHP 5 you must
+specify the class name.
 
 The message may contain a `%s`, which is replaced by the type of `$var`.
 

src/type_functions.php

@@ -97,21 +97,17 @@ function arrayify($var)
  * 
  * @param mixed           $var
  * @param string|string[] $type
- * @param string          $throwable  Class name (defaults to Throwable in PHP7, InvalidArgumentException in PHP5)
+ * @param string          $throwable  Class name
  * @param string          $message
  * @throws \InvalidArgumentException
  */
-function expect_type($var, $type, $throwable = null, $message = null)
+function expect_type($var, $type, $throwable = 'TypeError', $message = null)
 {
     $strTypes = [];
     $types = (array)$type;
 
     foreach ($types as $type) {
-        if ($type === 'boolean') {
-            $type = 'bool';
-        }
-        
-        $fn = 'is_' . $type;
+        $fn = $type === 'boolean' ? 'is_bool' : 'is_' . $type;
         $internal = function_exists($fn);
 
         if ($internal ? $fn($var) : is_a($var, $type)) {
@@ -121,10 +117,6 @@ function expect_type($var, $type, $throwable = null, $message = null)
         $strTypes[] = $type . ($internal ? '' : ' object');
     }
 
-    if (!isset($throwable)) {
-        $throwable = class_exists('TypeError') ? 'TypeError' : 'InvalidArgumentException';
-    }
-    
     if (!isset($message)) {
         $message = "Expected " . array_join_pretty(', ', ' or ', $strTypes) . ", %s given";
     }

tests/TypeFunctionsTest.php

@@ -184,7 +184,7 @@ public function testArrayifyCircularReference(\stdClass $object)
     {
         arrayify($object);
     }
-    
+
 
     public function expectTypeProvider()
     {
@@ -195,7 +195,7 @@ public function expectTypeProvider()
             [(object)[], 'stdClass'],
             [10, ['int', 'boolean']],
             ['foo', 'int', "Expected int, string given"],
-            ['foo', ['int', 'boolean'], "Expected int or bool, string given"],
+            ['foo', ['int', 'boolean'], "Expected int or boolean, string given"],
             [(object)[], 'Foo', "Expected Foo object, stdClass object given"],
         ];
     }
@@ -211,22 +211,11 @@ public function expectTypeProvider()
     public function testExpectType($var, $type, $error = false)
     {
         if ($error) {
-            $this->expectException(class_exists('TypeError') ? 'TypeError' : 'InvalidArgumentException');
+            $this->expectException(\InvalidArgumentException::class);
             $this->expectExceptionMessage($error);
         }
 
-        expect_type($var, $type);
-    }
-    
-    /**
-     * @covers Jasny\expect_type
-     * 
-     * @expectedException UnexpectedValueException
-     * @expectedExceptionMessage Expected int, string given
-     */
-    public function testExpectTypeExplicitThrowable()
-    {
-        expect_type('foo', 'int', \UnexpectedValueException::class);
+        expect_type($var, $type, \InvalidArgumentException::class);
     }
 
     /**