From 04dfd9b6bcfbcc23b2126e341155a961ac974d2b Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 21 Sep 2016 20:18:08 -0700 Subject: [PATCH] Move IP class to libs/ Also fix some misplaced parenthesis in IPTest. Change-Id: I84d6120c49f733ec45e7e0005259871808b7568b --- autoload.php | 2 +- includes/{utils => libs}/IP.php | 0 tests/phpunit/includes/{utils => libs}/IPTest.php | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename includes/{utils => libs}/IP.php (100%) rename tests/phpunit/includes/{utils => libs}/IPTest.php (99%) diff --git a/autoload.php b/autoload.php index aa0f561a1b..9e5bf04b78 100644 --- a/autoload.php +++ b/autoload.php @@ -586,7 +586,7 @@ $wgAutoloadLocalClasses = [ 'IJobSpecification' => __DIR__ . '/includes/jobqueue/JobSpecification.php', 'ILoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/ILoadBalancer.php', 'ILoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/ILoadMonitor.php', - 'IP' => __DIR__ . '/includes/utils/IP.php', + 'IP' => __DIR__ . '/includes/libs/IP.php', 'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php', 'IPTC' => __DIR__ . '/includes/media/IPTC.php', 'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php', diff --git a/includes/utils/IP.php b/includes/libs/IP.php similarity index 100% rename from includes/utils/IP.php rename to includes/libs/IP.php diff --git a/tests/phpunit/includes/utils/IPTest.php b/tests/phpunit/includes/libs/IPTest.php similarity index 99% rename from tests/phpunit/includes/utils/IPTest.php rename to tests/phpunit/includes/libs/IPTest.php index 5e0626b6bb..307652d938 100644 --- a/tests/phpunit/includes/utils/IPTest.php +++ b/tests/phpunit/includes/libs/IPTest.php @@ -44,7 +44,7 @@ class IPTest extends PHPUnit_Framework_TestCase { public function testisIPAddress() { $this->assertTrue( IP::isIPAddress( '::' ), 'RFC 4291 IPv6 Unspecified Address' ); $this->assertTrue( IP::isIPAddress( '::1' ), 'RFC 4291 IPv6 Loopback Address' ); - $this->assertTrue( IP::isIPAddress( '74.24.52.13/20', 'IPv4 range' ) ); + $this->assertTrue( IP::isIPAddress( '74.24.52.13/20' ), 'IPv4 range' ); $this->assertTrue( IP::isIPAddress( 'fc:100:a:d:1:e:ac:0/24' ), 'IPv6 range' ); $this->assertTrue( IP::isIPAddress( 'fc::100:a:d:1:e:ac/96' ), 'IPv6 range with "::"' ); @@ -99,7 +99,7 @@ class IPTest extends PHPUnit_Framework_TestCase { $this->assertTrue( IP::isIPv6( 'fc::100' ), 'IPv6 with "::" and 2 words' ); $this->assertTrue( IP::isIPv6( 'fc::100:a' ), 'IPv6 with "::" and 3 words' ); - $this->assertTrue( IP::isIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' ) ); + $this->assertTrue( IP::isIPv6( 'fc::100:a:d' ), 'IPv6 with "::" and 4 words' ); $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' ); $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e' ), 'IPv6 with "::" and 6 words' ); $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' ); -- 2.20.1