svn: /pear/pear-core/trunk/PEAR/PackageFile/v2/ Validator.php

dufuz                                    Sun, 27 Feb 2011 15:10:06 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308723

Log:
Fixed Bug #18308: Broken error message about missing channel validator [yunosh]

# Backported from branch 1.9.2

Bug: http://pear.php.net/bugs/18308 (unknown) 
      
Changed paths:
    U   pear/pear-core/trunk/PEAR/PackageFile/v2/Validator.php

Modified: pear/pear-core/trunk/PEAR/PackageFile/v2/Validator.php
===================================================================
--- pear/pear-core/trunk/PEAR/PackageFile/v2/Validator.php	2011-02-27 15:09:56 UTC (rev 308722)
+++ pear/pear-core/trunk/PEAR/PackageFile/v2/Validator.php	2011-02-27 15:10:06 UTC (rev 308723)
@@ -256,11 +256,10 @@
                 $validator = $chan->getValidationObject($this->_pf->getPackage());
                 if (!$validator) {
                     $this->_stack->push(__FUNCTION__, 'error',
-                        array_merge(
                             array('channel' => $chan->getName(),
-                                  'package' => $this->_pf->getPackage()),
-                              $valpack
-                            ),
+                              'package' => $this->_pf->getPackage(),
+                              'name'    => $valpack['_content'],
+                              'version' => $valpack['attribs']['version']),
                         'package "%channel%/%package%" cannot be properly validated without ' .
                         'validation package "%channel%/%name%-%version%"');
                     return $this->_isValid = 0;