dylangrech92 / seotoolbox

code/extenstions/SEOToolboxControllerExtension.php

Spacing +54 added lines, -54 removed lines

@@ -18,12 +18,12 @@ 
     private $excludeTags    = array();
     private $maxLinks       = 0;
 
-    public function index(){
+    public function index() {
         $this->addAutomatedLinks();
 
         // If we have a crawl request check the CrawlID so we're sure we didn't hit another SS site running our module
-        if( $crawl_id = $this->owner->request->getHeader('X-Crawl-Id') ){
-            return( $crawl_id == GlobalAutoLinkSettings::get_current()->CrawlID )
+        if ($crawl_id = $this->owner->request->getHeader('X-Crawl-Id')) {
+            return($crawl_id == GlobalAutoLinkSettings::get_current()->CrawlID)
                 ? $this->crawl_response()
                 : $this->owner->redirect(SEOTestSiteTreeController::getPermissionDeniedPage()->Link());
         }
@@ -31,15 +31,15 @@ 
         return array();
     }
 
-    private function crawl_response(){
+    private function crawl_response() {
         // Encoded version to detect which fields are being used
         $customize = array();
         $dbFields  = Config::inst()->get($this->owner->ClassName, 'db');
-        if(is_array($dbFields)) {
-            foreach ( $dbFields as $field => $type) {
+        if (is_array($dbFields)) {
+            foreach ($dbFields as $field => $type) {
                 if (strtolower($type) == 'htmltext') {
                     $data = ($this->owner->hasMethod($field)) ? $this->owner->$field() : $this->owner->$field;
-                    if($data){
+                    if ($data) {
                         $tmp = new HTMLText('tmp');
                         $tmp->setValue($data);
                         $data = base64_encode($tmp->forTemplate());
@@ -90,31 +90,31 @@ 
      *
      * @return void
      */
-    public function addAutomatedLinks(){
-        if( GlobalAutoLinkSettings::$enabled && $this->owner->class != 'RedirectorPage' ) {
+    public function addAutomatedLinks() {
+        if (GlobalAutoLinkSettings::$enabled && $this->owner->class != 'RedirectorPage') {
             $this->getSettings();
-            if( !$this->addLinks ) {
+            if (!$this->addLinks) {
                 return;
             }
 
-            foreach( $this->getSettings()->IncludeInFields() as $field ){
+            foreach ($this->getSettings()->IncludeInFields() as $field) {
                 // Check that the field provided by user exists in this object, is of type HTMLText and has content
-                if( AutomatedLink::isFieldParsable( $this->owner->data(), $field ) ){
+                if (AutomatedLink::isFieldParsable($this->owner->data(), $field)) {
 
                     // Create dummy object so we can parse the HTML
-                    $dummy = new HTMLText( $field );
-                    $dummy->setValue( $this->owner->$field );
+                    $dummy = new HTMLText($field);
+                    $dummy->setValue($this->owner->$field);
                     // Create DOMDocument Object
-                    $content = mb_convert_encoding( $dummy->forTemplate(), 'html-entities', GlobalAutoLinkSettings::$encoding );
+                    $content = mb_convert_encoding($dummy->forTemplate(), 'html-entities', GlobalAutoLinkSettings::$encoding);
                     $dom = AutomatedLink::constructDOMDocument($content);
 
                     // Check current link count and if it's already exceeded do nothing
-                    $this->linkCount += (int) $dom->getElementsByTagName( 'a' )->length;
-                    if( $this->linkCount >= $this->maxLinks ) {
+                    $this->linkCount += (int) $dom->getElementsByTagName('a')->length;
+                    if ($this->linkCount >= $this->maxLinks) {
                         return;
                     }
 
-                    $parsed = $this->parseField( $dom, $field );
+                    $parsed = $this->parseField($dom, $field);
                     $this->owner->data()->$field = $parsed;
                     $this->owner->$field         = $parsed;
                 }
@@ -130,19 +130,19 @@ 
      * @param array $hash_tags
      * @return array
      */
-    private function hashTags( DOMDocument $html, $hash_tags ){
+    private function hashTags(DOMDocument $html, $hash_tags) {
         $excluded = array();
-        foreach( $hash_tags as $eTag ){
-            while( $tags = $html->getElementsByTagName( $eTag ) ){
-                if( !$tags->length ) break 1;
-                $tag	= $tags->item(0);
-                $value  = $html->saveHTML( $tag );
-                $key    = (string) crc32( $value );
+        foreach ($hash_tags as $eTag) {
+            while ($tags = $html->getElementsByTagName($eTag)) {
+                if (!$tags->length) break 1;
+                $tag = $tags->item(0);
+                $value  = $html->saveHTML($tag);
+                $key    = (string) crc32($value);
 
                 // Convert back children nodes of this node if they were already hashed
-                $excluded[$key] = str_replace( array_keys( $excluded ), array_values( $excluded ), $value );
+                $excluded[$key] = str_replace(array_keys($excluded), array_values($excluded), $value);
 
-                $tag->parentNode->replaceChild( $html->createTextNode( $key ), $tag );
+                $tag->parentNode->replaceChild($html->createTextNode($key), $tag);
             }
         }
 
@@ -157,38 +157,38 @@ 
      * @param string $content
      * @return array
      */
-    public function addLinkToContent(AutomatedLink $link, &$content){
+    public function addLinkToContent(AutomatedLink $link, &$content) {
         $links  = array();
-        $max    = (int) ( $link->MaxLinksPerPage > 0 ) ? $link->MaxLinksPerPage : PHP_INT_MAX;
-        $escape = (string) preg_quote( $link->Phrase, '/' );
-        $regex  = (string) ( $link->CaseSensitive ) ? "/(\b{$escape}\b)/" : "/(\b{$escape}\b)/i";
+        $max    = (int) ($link->MaxLinksPerPage > 0) ? $link->MaxLinksPerPage : PHP_INT_MAX;
+        $escape = (string) preg_quote($link->Phrase, '/');
+        $regex  = (string) ($link->CaseSensitive) ? "/(\b{$escape}\b)/" : "/(\b{$escape}\b)/i";
 
         // Count the matches
-        preg_match_all( $regex, $content, $count );
-        $count = ( is_array( $count ) && isset( $count[0] ) ) ? count( $count[0] ) : 0;
-        if( $count < 1 ) $links;
+        preg_match_all($regex, $content, $count);
+        $count = (is_array($count) && isset($count[0])) ? count($count[0]) : 0;
+        if ($count < 1) $links;
 
-        if( isset( $this->maxLinksPerPage[ $link->ID ] ) ) {
+        if (isset($this->maxLinksPerPage[$link->ID])) {
             $max -= $this->maxLinksPerPage[$link->ID];
-        } else {
+        }else {
             $this->maxLinksPerPage[$link->ID] = 0;
         }
 
-        for( $x = 0; $x < $count; $x++ ){
+        for ($x = 0; $x < $count; $x++) {
             // Stop adding links if we reached the link or page limit
-            if( $x >= $max || $this->linkCount >= $this->maxLinks ) break;
+            if ($x >= $max || $this->linkCount >= $this->maxLinks) break;
 
             // Check if there is anything else to replace else stop
-            preg_match( $regex, $content, $match );
-            if( !is_array( $match ) || !count( $match ) ) break;
+            preg_match($regex, $content, $match);
+            if (!is_array($match) || !count($match)) break;
 
-            if( !$html = (string) $link->getHTML( $match[0] ) ) continue;
-            $key            = (string) crc32( $html );
-            $links[ $key ]  = (string) $html;
+            if (!$html = (string) $link->getHTML($match[0])) continue;
+            $key            = (string) crc32($html);
+            $links[$key]  = (string) $html;
 
-            $content = preg_replace( $regex, $key, $content, 1 );
+            $content = preg_replace($regex, $key, $content, 1);
             $this->linkCount++;
-            $this->maxLinksPerPage[ $link->ID ]++;
+            $this->maxLinksPerPage[$link->ID]++;
         }
 
         return $links;
@@ -201,24 +201,24 @@ 
      * @param String $field
      * @return string
      */
-    private function parseField( DOMDocument $html, $field ){
-        $this->owner->extend( 'beforeParseField', $html, $field );
+    private function parseField(DOMDocument $html, $field) {
+        $this->owner->extend('beforeParseField', $html, $field);
 
         // Remove Tags from Content we wown't be using
         $excluded   = $this->hashTags($html, $this->excludeTags);
-        $body       = (string)$html->saveHTML( $html->getElementsByTagName('body')->item(0) );
-        $content    = preg_replace( array( '/\<body\>/is', '/\<\/body\>/is' ), '', $body, 1 );
+        $body       = (string) $html->saveHTML($html->getElementsByTagName('body')->item(0));
+        $content    = preg_replace(array('/\<body\>/is', '/\<\/body\>/is'), '', $body, 1);
 
-        foreach( AutomatedLink::get()->sort('Priority') as $link){
-            if( $this->linkCount < $this->maxLinks && $link->canBeAdded( $this->owner, $field ) ) {
+        foreach (AutomatedLink::get()->sort('Priority') as $link) {
+            if ($this->linkCount < $this->maxLinks && $link->canBeAdded($this->owner, $field)) {
                 $links = $this->addLinkToContent($link, $content);
-                if( is_array($links) && count($links) > 0 ) {
-                    $excluded = $excluded + $links;
+                if (is_array($links) && count($links) > 0) {
+                    $excluded = $excluded+$links;
                 }
             }
         }
 
         // Re-add the excluded Tags
-        return str_replace( array_keys( $excluded ), array_values( $excluded ), $content );
+        return str_replace(array_keys($excluded), array_values($excluded), $content);
     }
 }

Braces +21 added lines, -7 removed lines

@@ -73,12 +73,16 @@ 
     private function getSettings() {
         if ($this->settings === null) {
             $this->settings = GlobalAutoLinkSettings::get_current();
-            if (!$this->settings) return $this->addLinks = false;
+            if (!$this->settings) {
+                return $this->addLinks = false;
+            }
 
             $this->excludeTags = (array) $this->settings->ExcludeTags();
             $this->maxLinks = (int) ($this->settings->MaxLinksPerPage) ? $this->settings->MaxLinksPerPage : PHP_INT_MAX;
 
-            if (!in_array($this->owner->ClassName, $this->settings->AllowedIn())) $this->addLinks = false;
+            if (!in_array($this->owner->ClassName, $this->settings->AllowedIn())) {
+                $this->addLinks = false;
+            }
         }
 
         return $this->settings;
@@ -134,7 +138,9 @@ 
         $excluded = array();
         foreach( $hash_tags as $eTag ){
             while( $tags = $html->getElementsByTagName( $eTag ) ){
-                if( !$tags->length ) break 1;
+                if( !$tags->length ) {
+                    break 1;
+                }
                 $tag	= $tags->item(0);
                 $value  = $html->saveHTML( $tag );
                 $key    = (string) crc32( $value );
@@ -166,7 +172,9 @@ 
         // Count the matches
         preg_match_all( $regex, $content, $count );
         $count = ( is_array( $count ) && isset( $count[0] ) ) ? count( $count[0] ) : 0;
-        if( $count < 1 ) $links;
+        if( $count < 1 ) {
+            $links;
+        }
 
         if( isset( $this->maxLinksPerPage[ $link->ID ] ) ) {
             $max -= $this->maxLinksPerPage[$link->ID];
@@ -176,13 +184,19 @@ 
 
         for( $x = 0; $x < $count; $x++ ){
             // Stop adding links if we reached the link or page limit
-            if( $x >= $max || $this->linkCount >= $this->maxLinks ) break;
+            if( $x >= $max || $this->linkCount >= $this->maxLinks ) {
+                break;
+            }
 
             // Check if there is anything else to replace else stop
             preg_match( $regex, $content, $match );
-            if( !is_array( $match ) || !count( $match ) ) break;
+            if( !is_array( $match ) || !count( $match ) ) {
+                break;
+            }
 
-            if( !$html = (string) $link->getHTML( $match[0] ) ) continue;
+            if( !$html = (string) $link->getHTML( $match[0] ) ) {
+                continue;
+            }
             $key            = (string) crc32( $html );
             $links[ $key ]  = (string) $html;
 

code/controllers/SEOTestSiteTreeController.php

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
 
         Requirements::clear();
 
-        if (!Member::currentUser()  || !Permission::check('CMS_ACCESS_SEOToolboxAdmin')){
+        if (!Member::currentUser() || !Permission::check('CMS_ACCESS_SEOToolboxAdmin')) {
             return $this->redirect(Security::login_url().'?BackURL=/seotest');
         }
 
@@ -151,9 +151,9 @@ 
      * @param string $data
      * @return array
      */
-    private function getHTMLFieldsData($data){
+    private function getHTMLFieldsData($data) {
         preg_match_all('/\[\*\*\[(.*?)\]\*\*\[(.*?)\]\*\*\]/im', $data, $matches);
-        foreach( $matches[2] as $key => $field_text ){
+        foreach ($matches[2] as $key => $field_text) {
             $matches[2][$key] = base64_decode($field_text);
             $matches[3][$key] = preg_replace('/[\s]+/mu', ' ', strip_tags($matches[2][$key]));
         }
@@ -168,38 +168,38 @@ 
      * @param (null|string) $agent
      * @return array
      */
-    public function loadPage($url, $agent=null){
+    public function loadPage($url, $agent = null) {
         $crawl_id = GlobalAutoLinkSettings::get_current()->CrawlID;
         $ch = curl_init();
-        curl_setopt( $ch, CURLOPT_URL, Director::absoluteBaseURL().'/'.$url );
-        curl_setopt( $ch, CURLOPT_HEADER, true );
-        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-        curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
-        curl_setopt( $ch, CURLOPT_MAXREDIRS, 10 );
-        curl_setopt( $ch, CURLOPT_USERAGENT, $agent );
-        curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 10 );
-        curl_setopt( $ch, CURLOPT_TIMEOUT, 30 );
-        curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, array( 'X-Crawl-Id: '.$crawl_id ) );
-        $data = curl_exec( $ch );
+        curl_setopt($ch, CURLOPT_URL, Director::absoluteBaseURL().'/'.$url);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+        curl_setopt($ch, CURLOPT_USERAGENT, $agent);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('X-Crawl-Id: '.$crawl_id));
+        $data = curl_exec($ch);
 
         $fetched        = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL), PHP_URL_PATH);
-        $header_size    = curl_getinfo( $ch, CURLINFO_HEADER_SIZE );
-        $header 	    = explode( "\r\n\r\n", substr( $data, 0, $header_size ) );
-        array_pop( $header ); // Remove last element as it will always be empty
-        $header = array_pop( $header );
-        $body   = preg_replace('/[\s]+/mu', ' ', substr( $data, $header_size ));
+        $header_size    = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        $header = explode("\r\n\r\n", substr($data, 0, $header_size));
+        array_pop($header); // Remove last element as it will always be empty
+        $header = array_pop($header);
+        $body   = preg_replace('/[\s]+/mu', ' ', substr($data, $header_size));
 
-        curl_close( $ch );
+        curl_close($ch);
 
-        if( !strpos( $header, ' 200 ' ) ) {
-            return array( 'headers' => false, 'body' => false );
+        if (!strpos($header, ' 200 ')) {
+            return array('headers' => false, 'body' => false);
         }
 
         $field_data = $this->getHTMLFieldsData($body);
         $body = str_replace($field_data[0], $field_data[2], $body);
 
-        return array( 'headers' => $header, 'body' => $body, 'field_data' => $field_data, 'url_fetched' => $fetched );
+        return array('headers' => $header, 'body' => $body, 'field_data' => $field_data, 'url_fetched' => $fetched);
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -113,8 +113,9 @@
                 $phrases = array_merge($phrases, $matches[$commands['find_pos']]);
             }
 
-            if (isset($commands['replace']))
-                $html = preg_replace($commands['replace'], ' ', $html);
+            if (isset($commands['replace'])) {
+                            $html = preg_replace($commands['replace'], ' ', $html);
+            }
         }
 
         // Remove the empty elements

_config.php

Spacing +4 added lines, -4 removed lines

@@ -6,15 +6,15 @@
  *
  */
 
-define( 'SEOTOOLBOX_DIR', str_replace( Director::baseFolder().'/', '', __DIR__ ) );
+define('SEOTOOLBOX_DIR', str_replace(Director::baseFolder().'/', '', __DIR__));
 
 Config::inst()->update('SEOToolboxAdmin', 'menu_icon', SEOTOOLBOX_DIR.'/code/admin/icon/seotoolbox-icon.png');
-Config::inst()->update('LeftAndMain','extra_requirements_javascript', array(SEOTOOLBOX_DIR.'/js/seo_page_analyzer.js'));
-Config::inst()->update('LeftAndMain','extra_requirements_css', array(SEOTOOLBOX_DIR.'/css/seo_page_analyzer.css'));
+Config::inst()->update('LeftAndMain', 'extra_requirements_javascript', array(SEOTOOLBOX_DIR.'/js/seo_page_analyzer.js'));
+Config::inst()->update('LeftAndMain', 'extra_requirements_css', array(SEOTOOLBOX_DIR.'/css/seo_page_analyzer.css'));
 
 CMSMenu::add_link('seotest', 'Run Crawler', '/seotest', 9, array('target' => '_blank'));
 Requirements::customCSS('.icon.icon-16.icon-seotest{background:url('.SEOTOOLBOX_DIR.'/code/admin/icon/crawl-icon.png)}');
 
-if(Director::is_cli()){
+if (Director::is_cli()) {
     Config::inst()->update('Director', 'environment_type', 'dev');
 }

tests/AutomatedLinkTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      * Renders the passed $page and returns all links found if any
      *
      * @param SiteTree $page
-     * @return DOMNameList
+     * @return DOMNodeList
      */
     public static function getLinksFromPage(SiteTree $page){
         $dom = self::getPageDOM($page);

Spacing +25 added lines, -25 removed lines

@@ -13,8 +13,8 @@ 
     /**
      * Test that links are included in the content field
      */
-    public function testInsertion(){
-        $this->objFromFixture('AutomatedLink','link');
+    public function testInsertion() {
+        $this->objFromFixture('AutomatedLink', 'link');
         $page   = $this->createPage('<p>Checking if phrase is replaced</p>');
         $link   = $this->getLinkFromPage($page);
         $this->assertTrue($link->nodeValue === 'phrase', 'Link wasn\'t created');
@@ -23,41 +23,41 @@ 
     /**
      * Test the individual properties of the automated link
      */
-    public function testProperties(){
-        $this->objFromFixture('AutomatedLink','link2');
+    public function testProperties() {
+        $this->objFromFixture('AutomatedLink', 'link2');
 
         $page   = self::createPage('<p>Checking if properties is with correct props</p>');
         $link   = self::getLinkFromPage($page);
 
-        $this->assertTrue( $link->nodeValue === 'properties', 'Phrase did not match' );
-        $this->assertTrue( $link->getAttribute('title') === 'test title', 'Title did not match' );
-        $this->assertTrue( $link->getAttribute('href') === '#test-anchor', 'Anchor did not match' );
-        $this->assertTrue( $link->getAttribute('target') === '_blank', 'Target did not match' );
-        $this->assertTrue( $link->getAttribute('rel') === 'nofollow', 'Rel did not match' );
+        $this->assertTrue($link->nodeValue === 'properties', 'Phrase did not match');
+        $this->assertTrue($link->getAttribute('title') === 'test title', 'Title did not match');
+        $this->assertTrue($link->getAttribute('href') === '#test-anchor', 'Anchor did not match');
+        $this->assertTrue($link->getAttribute('target') === '_blank', 'Target did not match');
+        $this->assertTrue($link->getAttribute('rel') === 'nofollow', 'Rel did not match');
     }
 
     /**
      * Test that the default properties match what we expect
      */
-    public function testDefaultProperties(){
-        $this->objFromFixture('AutomatedLink','link3');
+    public function testDefaultProperties() {
+        $this->objFromFixture('AutomatedLink', 'link3');
 
         $page   = self::createPage('<p>Checking if default is correct</p>');
         $link   = self::getLinkFromPage($page);
         $auto   = AutomatedLink::get()->find('Phrase', 'default');
 
-        $this->assertTrue( $link->nodeValue === 'default', 'Phrase did not match' );
-        $this->assertTrue( $link->getAttribute('title') === '', 'Title did not match' );
-        $this->assertTrue( $link->getAttribute('href') === '#', 'href did not match' );
-        $this->assertTrue( $link->getAttribute('target') === '', 'Target did not match' );
-        $this->assertTrue( $link->getAttribute('rel') === '', 'Rel did not match' );
-        $this->assertTrue( (int) $link->getAttribute('data-id') === $auto->ID, 'data-id did not match' );
+        $this->assertTrue($link->nodeValue === 'default', 'Phrase did not match');
+        $this->assertTrue($link->getAttribute('title') === '', 'Title did not match');
+        $this->assertTrue($link->getAttribute('href') === '#', 'href did not match');
+        $this->assertTrue($link->getAttribute('target') === '', 'Target did not match');
+        $this->assertTrue($link->getAttribute('rel') === '', 'Rel did not match');
+        $this->assertTrue((int) $link->getAttribute('data-id') === $auto->ID, 'data-id did not match');
     }
 
     /**
      * Test that the default properties match what we expect
      */
-    public function testLimitFilter(){
+    public function testLimitFilter() {
         $page   = self::createPage('<p>Checking if default is created only twice. default default</p>');
         $dom    = self::getPageDOM($page);
         $links  = $dom->getElementsByTagName('a');
@@ -67,7 +67,7 @@ 
     /**
      * Test that the default properties match what we expect
      */
-    public function testDisableFilter(){
+    public function testDisableFilter() {
         GlobalAutoLinkSettings::$enabled = false;
         $page   = self::createPage('<p>Checking if default is created at all when automated links are disabled.</p>');
         $links  = self::getLinksFromPage($page);
@@ -81,7 +81,7 @@ 
      * @param SiteTree $page
      * @return DOMNameList
      */
-    public static function getLinksFromPage(SiteTree $page){
+    public static function getLinksFromPage(SiteTree $page) {
         $dom = self::getPageDOM($page);
         return $dom->getElementsByTagName('a');
     }
@@ -94,9 +94,9 @@ 
      * @param SiteTree $page
      * @return DOMDocument
      */
-    public static function getLinkFromPage(SiteTree $page){
+    public static function getLinkFromPage(SiteTree $page) {
         $links = self::getLinksFromPage($page);
-        return ( $links->length != 1 ) ? new DOMElement() : $links->item(0);
+        return ($links->length != 1) ? new DOMElement() : $links->item(0);
     }
 
     /**
@@ -105,8 +105,8 @@ 
      * @param string|null $content
      * @return Page
      */
-    public static function createPage($content=null){
-        $page = Page::create(array( 'Content' => $content ));
+    public static function createPage($content = null) {
+        $page = Page::create(array('Content' => $content));
         $page->write();
         return $page;
     }
@@ -117,7 +117,7 @@ 
      * @param Page $page
      * @return DOMDocument
      */
-    public static function getPageDOM(Page $page){
+    public static function getPageDOM(Page $page) {
         $controller = Page_Controller::create($page);
         $controller->invokeWithExtensions('addAutomatedLinks');
         return AutomatedLink::constructDOMDocument($controller->Content);

tests/GlobalAutoLinkSettingsTest.php

Spacing +7 added lines, -7 removed lines

@@ -13,10 +13,10 @@ 
     /**
      * Test Max Links per page
      */
-    public function testMaxLinksPerPage(){
-        $this->objFromFixture('AutomatedLink','link');
-        $this->objFromFixture('AutomatedLink','link2');
-        $this->objFromFixture('AutomatedLink','link3');
+    public function testMaxLinksPerPage() {
+        $this->objFromFixture('AutomatedLink', 'link');
+        $this->objFromFixture('AutomatedLink', 'link2');
+        $this->objFromFixture('AutomatedLink', 'link3');
 
         $settings = GlobalAutoLinkSettings::get()->first();
         $settings->MaxLinksPerPage = 1;
@@ -30,7 +30,7 @@ 
     /**
      * Test that links are not created inside of exclude tags
      */
-    public function testExcludeTags(){
+    public function testExcludeTags() {
         $settings = GlobalAutoLinkSettings::get()->first();
         $settings->MaxLinksPerPage = 0;
         $settings->write();
@@ -45,7 +45,7 @@ 
     /**
      * Test that links are included in all the specified fields
      */
-    public function testIncludeIn(){
+    public function testIncludeIn() {
         $settings = GlobalAutoLinkSettings::get()->first();
         $settings->IncludeIn = 'Content, Introduction';
         $settings->write();
@@ -82,7 +82,7 @@ 
 /**
  * Simple test page to test settings
  */
-class TestPage extends Page implements TestOnly{
+class TestPage extends Page implements TestOnly {
     private static $db = array(
         'Introduction' => 'HTMLText'
     );