Skip to content

Commit a406c85

Browse files
sebastianbergmannsebastianbergmann
committed
Closes #3368 
1 parent 1d9edd0 commit a406c85

File tree

5 files changed

+561
-3
lines changed

5 files changed

+561
-3
lines changed

‎ChangeLog-7.5.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ All notable changes of the PHPUnit 7.5 release series are documented in this fil
77
### Added
88

99
* Implemented [#3340](https://github.com/sebastianbergmann/phpunit/issues/3340): Added `assertEqualsCanonicalizing()`, `assertEqualsIgnoringCase()`, `assertEqualsWithDelta()`, `assertNotEqualsCanonicalizing()`, `assertNotEqualsIgnoringCase()`, and `assertNotEqualsWithDelta()` as alternatives to using `assertEquals()` and `assertNotEquals()` with the `$delta`, `$canonicalize`, or `$ignoreCase` parameters
10+
* Implemented [#3368](https://github.com/sebastianbergmann/phpunit/issues/3368): Added `assertIsArray()`, `assertIsBool()`, `assertIsFloat()`, `assertIsInt()`, `assertIsNumeric()`, `assertIsObject()`, `assertIsResource()`, `assertIsString()`, `assertIsScalar()`, `assertIsCallable()`, `assertIsIterable()`, `assertIsNotArray()`, `assertIsNotBool()`, `assertIsNotFloat()`, `assertIsNotInt()`, `assertIsNotNumeric()`, `assertIsNotObject()`, `assertIsNotResource()`, `assertIsNotString()`, `assertIsNotScalar()`, `assertIsNotCallable()`, `assertIsNotIterable()` as alternatives to `assertInternalType()` and `assertNotInternalType()`
1011

1112
### Deprecated
1213

1314
* The optional parameters `$delta`, `$maxDepth`, `$canonicalize`, and `$ignoreCase` of `assertEquals()`, and `assertNotEquals` are now deprecated. There is no behavioral change in this version of PHPUnit. Using these parameters will trigger a deprecation warning in PHPUnit 8 and in PHPUnit 9 these parameters will be removed.
15+
* The methods `assertInternalType()` and `assertNotInternalType()` are now deprecated. There is no behavioral change in this version of PHPUnit. Using these methods will trigger a deprecation warning in PHPUnit 8 and in PHPUnit 9 these methods will be removed.
1416
* The methods `assertAttributeContains()`, `assertAttributeNotContains()`, `assertAttributeContainsOnly()`, `assertAttributeNotContainsOnly()`, `assertAttributeCount()`, `assertAttributeNotCount()`, `assertAttributeEquals()`, `assertAttributeNotEquals()`, `assertAttributeEmpty()`, `assertAttributeNotEmpty()`, `assertAttributeGreaterThan()`, `assertAttributeGreaterThanOrEqual()`, `assertAttributeLessThan()`, `assertAttributeLessThanOrEqual()`, `assertAttributeSame()`, `assertAttributeNotSame()`, `assertAttributeInstanceOf()`, `assertAttributeNotInstanceOf()`, `assertAttributeInternalType()`, `assertAttributeNotInternalType()`, `attributeEqualTo()`, `readAttribute()`, `getStaticAttribute()`, and `getObjectAttribute()` are now deprecated. There is no behavioral change in this version of PHPUnit. Using these methods will trigger a deprecation warning in PHPUnit 8 and in PHPUnit 9 these methods will be removed.
1517
* The annotations `@expectedException`, `@expectedExceptionCode`, `@expectedExceptionMessage`, and `@expectedExceptionMessageRegExp` are now deprecated. There is no behavioral change in this version of PHPUnit. Using these annotations will trigger a deprecation warning in PHPUnit 8 and in PHPUnit 9 these annotations will be removed.
1618

‎src/Framework/Assert.php

+268
Original file line numberDiff line numberDiff line change
@@ -1549,6 +1549,8 @@ public static function assertAttributeNotInstanceOf(string $expected, string $at
15491549
*
15501550
* @throws ExpectationFailedException
15511551
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
1552+
*
1553+
* @deprecated https://github.com/sebastianbergmann/phpunit/issues/3369
15521554
*/
15531555
public static function assertInternalType(string $expected, $actual, string $message = ''): void
15541556
{
@@ -1578,11 +1580,145 @@ public static function assertAttributeInternalType(string $expected, string $att
15781580
);
15791581
}
15801582

1583+
/**
1584+
* Asserts that a variable is of type array.
1585+
*/
1586+
public static function assertIsArray($actual, string $message = ''): void
1587+
{
1588+
static::assertThat(
1589+
$actual,
1590+
new IsType(IsType::TYPE_ARRAY),
1591+
$message
1592+
);
1593+
}
1594+
1595+
/**
1596+
* Asserts that a variable is of type bool.
1597+
*/
1598+
public static function assertIsBool($actual, string $message = ''): void
1599+
{
1600+
static::assertThat(
1601+
$actual,
1602+
new IsType(IsType::TYPE_BOOL),
1603+
$message
1604+
);
1605+
}
1606+
1607+
/**
1608+
* Asserts that a variable is of type float.
1609+
*/
1610+
public static function assertIsFloat($actual, string $message = ''): void
1611+
{
1612+
static::assertThat(
1613+
$actual,
1614+
new IsType(IsType::TYPE_FLOAT),
1615+
$message
1616+
);
1617+
}
1618+
1619+
/**
1620+
* Asserts that a variable is of type int.
1621+
*/
1622+
public static function assertIsInt($actual, string $message = ''): void
1623+
{
1624+
static::assertThat(
1625+
$actual,
1626+
new IsType(IsType::TYPE_INT),
1627+
$message
1628+
);
1629+
}
1630+
1631+
/**
1632+
* Asserts that a variable is of type numeric.
1633+
*/
1634+
public static function assertIsNumeric($actual, string $message = ''): void
1635+
{
1636+
static::assertThat(
1637+
$actual,
1638+
new IsType(IsType::TYPE_NUMERIC),
1639+
$message
1640+
);
1641+
}
1642+
1643+
/**
1644+
* Asserts that a variable is of type object.
1645+
*/
1646+
public static function assertIsObject($actual, string $message = ''): void
1647+
{
1648+
static::assertThat(
1649+
$actual,
1650+
new IsType(IsType::TYPE_OBJECT),
1651+
$message
1652+
);
1653+
}
1654+
1655+
/**
1656+
* Asserts that a variable is of type resource.
1657+
*/
1658+
public static function assertIsResource($actual, string $message = ''): void
1659+
{
1660+
static::assertThat(
1661+
$actual,
1662+
new IsType(IsType::TYPE_RESOURCE),
1663+
$message
1664+
);
1665+
}
1666+
1667+
/**
1668+
* Asserts that a variable is of type string.
1669+
*/
1670+
public static function assertIsString($actual, string $message = ''): void
1671+
{
1672+
static::assertThat(
1673+
$actual,
1674+
new IsType(IsType::TYPE_STRING),
1675+
$message
1676+
);
1677+
}
1678+
1679+
/**
1680+
* Asserts that a variable is of type scalar.
1681+
*/
1682+
public static function assertIsScalar($actual, string $message = ''): void
1683+
{
1684+
static::assertThat(
1685+
$actual,
1686+
new IsType(IsType::TYPE_SCALAR),
1687+
$message
1688+
);
1689+
}
1690+
1691+
/**
1692+
* Asserts that a variable is of type callable.
1693+
*/
1694+
public static function assertIsCallable($actual, string $message = ''): void
1695+
{
1696+
static::assertThat(
1697+
$actual,
1698+
new IsType(IsType::TYPE_CALLABLE),
1699+
$message
1700+
);
1701+
}
1702+
1703+
/**
1704+
* Asserts that a variable is of type iterable.
1705+
*/
1706+
public static function assertIsIterable($actual, string $message = ''): void
1707+
{
1708+
static::assertThat(
1709+
$actual,
1710+
new IsType(IsType::TYPE_ITERABLE),
1711+
$message
1712+
);
1713+
}
1714+
15811715
/**
15821716
* Asserts that a variable is not of a given type.
15831717
*
15841718
* @throws ExpectationFailedException
15851719
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
1720+
*
1721+
* @deprecated https://github.com/sebastianbergmann/phpunit/issues/3369
15861722
*/
15871723
public static function assertNotInternalType(string $expected, $actual, string $message = ''): void
15881724
{
@@ -1595,6 +1731,138 @@ public static function assertNotInternalType(string $expected, $actual, string $
15951731
);
15961732
}
15971733

1734+
/**
1735+
* Asserts that a variable is not of type array.
1736+
*/
1737+
public static function assertIsNotArray($actual, string $message = ''): void
1738+
{
1739+
static::assertThat(
1740+
$actual,
1741+
new LogicalNot(new IsType(IsType::TYPE_ARRAY)),
1742+
$message
1743+
);
1744+
}
1745+
1746+
/**
1747+
* Asserts that a variable is not of type bool.
1748+
*/
1749+
public static function assertIsNotBool($actual, string $message = ''): void
1750+
{
1751+
static::assertThat(
1752+
$actual,
1753+
new LogicalNot(new IsType(IsType::TYPE_BOOL)),
1754+
$message
1755+
);
1756+
}
1757+
1758+
/**
1759+
* Asserts that a variable is not of type float.
1760+
*/
1761+
public static function assertIsNotFloat($actual, string $message = ''): void
1762+
{
1763+
static::assertThat(
1764+
$actual,
1765+
new LogicalNot(new IsType(IsType::TYPE_FLOAT)),
1766+
$message
1767+
);
1768+
}
1769+
1770+
/**
1771+
* Asserts that a variable is not of type int.
1772+
*/
1773+
public static function assertIsNotInt($actual, string $message = ''): void
1774+
{
1775+
static::assertThat(
1776+
$actual,
1777+
new LogicalNot(new IsType(IsType::TYPE_INT)),
1778+
$message
1779+
);
1780+
}
1781+
1782+
/**
1783+
* Asserts that a variable is not of type numeric.
1784+
*/
1785+
public static function assertIsNotNumeric($actual, string $message = ''): void
1786+
{
1787+
static::assertThat(
1788+
$actual,
1789+
new LogicalNot(new IsType(IsType::TYPE_NUMERIC)),
1790+
$message
1791+
);
1792+
}
1793+
1794+
/**
1795+
* Asserts that a variable is not of type object.
1796+
*/
1797+
public static function assertIsNotObject($actual, string $message = ''): void
1798+
{
1799+
static::assertThat(
1800+
$actual,
1801+
new LogicalNot(new IsType(IsType::TYPE_OBJECT)),
1802+
$message
1803+
);
1804+
}
1805+
1806+
/**
1807+
* Asserts that a variable is not of type resource.
1808+
*/
1809+
public static function assertIsNotResource($actual, string $message = ''): void
1810+
{
1811+
static::assertThat(
1812+
$actual,
1813+
new LogicalNot(new IsType(IsType::TYPE_RESOURCE)),
1814+
$message
1815+
);
1816+
}
1817+
1818+
/**
1819+
* Asserts that a variable is not of type string.
1820+
*/
1821+
public static function assertIsNotString($actual, string $message = ''): void
1822+
{
1823+
static::assertThat(
1824+
$actual,
1825+
new LogicalNot(new IsType(IsType::TYPE_STRING)),
1826+
$message
1827+
);
1828+
}
1829+
1830+
/**
1831+
* Asserts that a variable is not of type scalar.
1832+
*/
1833+
public static function assertIsNotScalar($actual, string $message = ''): void
1834+
{
1835+
static::assertThat(
1836+
$actual,
1837+
new LogicalNot(new IsType(IsType::TYPE_SCALAR)),
1838+
$message
1839+
);
1840+
}
1841+
1842+
/**
1843+
* Asserts that a variable is not of type callable.
1844+
*/
1845+
public static function assertIsNotCallable($actual, string $message = ''): void
1846+
{
1847+
static::assertThat(
1848+
$actual,
1849+
new LogicalNot(new IsType(IsType::TYPE_CALLABLE)),
1850+
$message
1851+
);
1852+
}
1853+
1854+
/**
1855+
* Asserts that a variable is not of type iterable.
1856+
*/
1857+
public static function assertIsNotIterable($actual, string $message = ''): void
1858+
{
1859+
static::assertThat(
1860+
$actual,
1861+
new LogicalNot(new IsType(IsType::TYPE_ITERABLE)),
1862+
$message
1863+
);
1864+
}
1865+
15981866
/**
15991867
* Asserts that an attribute is of a given type.
16001868
*

0 commit comments

Comments
 (0)