Merge pull request #298 from marc1706/ticket/297

[ticket/297] Enable codesniffer again

.travis.yml

@@ -29,7 +29,7 @@ matrix:
 env:
   global:
     - EXTNAME="board3/portal"
-    - SNIFF="0"        # Should we run code sniffer on your code?
+    - SNIFF="1"        # Should we run code sniffer on your code?
     - IMAGE_ICC="0"    # Should we run icc profile sniffer on your images?
     - COVERALLS="1"    # Should we run coveralls?
     - PHPBB_BRANCH="develop-ascraeus"
@@ -54,7 +54,7 @@ before_script:
   - chmod +wx build/logs
 
 script:
-  - sh -c "if [ '$SNIFF' != '0' ]; then travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION; fi"
+  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
   - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
   - ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION
 

acp/portal_module.php

@@ -148,7 +148,7 @@ class portal_module
 				else
 				{
 					// only show the mod version check if we are on the General Settings page
-					$this->version_check->version_check();
+					$this->version_check->check();
 				}
 
 				$this->new_config = $this->config;

includes/version_check.php

@@ -67,7 +67,7 @@ class version_check
 	* @param bool $return_version Yes if current version should be returned
 	* @return string Current version if $return_version is set to true
 	*/
-	public function version_check($return_version = false)
+	public function check($return_version = false)
 	{
 		if (!function_exists('get_remote_file'))
 		{

tests/unit/functions/version_check_test.php

@@ -39,8 +39,8 @@ class phpbb_functions_version_check_test extends \board3\portal\tests\testframew
 	public function test_version_check()
 	{
 		$this->assertTrue(true);
-		$this->assertNull($this->version_check->version_check());
-		$this->assertEquals('2.1.0', $this->version_check->version_check(true));
+		$this->assertNull($this->version_check->check());
+		$this->assertEquals('2.1.0', $this->version_check->check(true));
 		$this->template->assert_equals(array(
 			'CURRENT_VERSION' => '2.1.0',
 			'TITLE' => 'Board3 Portal',