r69458 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69457‎ | r69458 | r69459 >
Date:00:59, 17 July 2010
Author:jeroendedauw
Status:deferred (Comments)
Tags:
Comment:
Follow up to r69457
Modified paths:
  • /trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php (modified) (history)
  • /trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php (modified) (history)
  • /trunk/extensions/Maps/Services/iMappingService.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Maps/Services/iMappingService.php
@@ -69,15 +69,6 @@
7070 function addFeature( $featureName, $handlingClass );
7171
7272 /**
73 - * Adds the mapping services dependencies to the header.
74 - *
75 - * @since 0.6.5
76 - *
77 - * @param mixed $parserOrOut
78 - */
79 - function addDependencies( &$parserOrOut );
80 -
81 - /**
8273 * Returns the html for the needed dependencies or false.
8374 *
8475 * @since 0.6.5
Index: trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
@@ -24,7 +24,10 @@
2525 */
2626 abstract class MapsBasePointMap implements iMappingParserFunction {
2727
28 - public $service;
 28+ /**
 29+ * @var iMappingService
 30+ */
 31+ protected $service;
2932
3033 protected $centreLat, $centreLon;
3134 protected $markerJs;
@@ -40,7 +43,7 @@
4144 private $specificParameters = false;
4245 private $markerData = array();
4346
44 - public function __construct( MapsMappingService $service ) {
 47+ public function __construct( iMappingService $service ) {
4548 $this->service = $service;
4649 }
4750
Index: trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php
@@ -24,6 +24,9 @@
2525 */
2626 abstract class MapsBaseMap implements iMappingParserFunction {
2727
 28+ /**
 29+ * @var iMappingService
 30+ */
2831 protected $service;
2932
3033 protected $centreLat, $centreLon;
@@ -40,7 +43,7 @@
4144 *
4245 * @param MapsMappingService $service
4346 */
44 - public function __construct( MapsMappingService $service ) {
 47+ public function __construct( iMappingService $service ) {
4548 $this->service = $service;
4649 }
4750

Follow-up revisions

RevisionCommit summaryAuthorDate
r69520Follow up to r69458jeroendedauw20:04, 18 July 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r69457Changes for 0.6.5 - refactoringjeroendedauw00:54, 17 July 2010

Comments

#Comment by Nikerabbit (talk | contribs)   07:33, 18 July 2010

PHP Fatal error: Declaration of MapsBasePointMap::__construct() must be compatible with that of iMappingParserFunction::__construct() in /www/w/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php on line 25

Three different fatal errors this week. You should really take Siebrand's user page at twn as a test case.

Status & tagging log