jenkins-bot has submitted this change and it was merged.

Change subject: Move IP class to libs/
......................................................................


Move IP class to libs/

Also fix some misplaced parenthesis in IPTest.

Change-Id: I84d6120c49f733ec45e7e0005259871808b7568b
---
M autoload.php
R includes/libs/IP.php
R tests/phpunit/includes/libs/IPTest.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/autoload.php b/autoload.php
index aa0f561..9e5bf04 100644
--- a/autoload.php
+++ b/autoload.php
@@ -586,7 +586,7 @@
        '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 98%
rename from tests/phpunit/includes/utils/IPTest.php
rename to tests/phpunit/includes/libs/IPTest.php
index 5e0626b..307652d 100644
--- a/tests/phpunit/includes/utils/IPTest.php
+++ b/tests/phpunit/includes/libs/IPTest.php
@@ -44,7 +44,7 @@
        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 @@
 
                $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' );

-- 
To view, visit https://gerrit.wikimedia.org/r/312163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I84d6120c49f733ec45e7e0005259871808b7568b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to