HOR-4547: incompatible data type
This commit is contained in:
2
thirdparty/phing/ProjectComponent.php
vendored
2
thirdparty/phing/ProjectComponent.php
vendored
@@ -44,7 +44,7 @@ abstract class ProjectComponent {
|
|||||||
* @param object The reference to the current project
|
* @param object The reference to the current project
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function setProject($project) {
|
function setProject(Project $project) {
|
||||||
$this->project = $project;
|
$this->project = $project;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
2
thirdparty/phing/types/Mapper.php
vendored
2
thirdparty/phing/types/Mapper.php
vendored
@@ -134,7 +134,7 @@ class Mapper extends DataType {
|
|||||||
*
|
*
|
||||||
* You must not set any other attribute if you make it a reference.
|
* You must not set any other attribute if you make it a reference.
|
||||||
*/
|
*/
|
||||||
function setRefid($r) {
|
function setRefid(Reference $r) {
|
||||||
if ($this->type !== null || $this->from !== null || $this->to !== null) {
|
if ($this->type !== null || $this->from !== null || $this->to !== null) {
|
||||||
throw DataType::tooManyAttributes();
|
throw DataType::tooManyAttributes();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class AppAssignSelfServiceValue extends BaseAppAssignSelfServiceValue
|
|||||||
*
|
*
|
||||||
* return void
|
* return void
|
||||||
*/
|
*/
|
||||||
public function create($applicationUid, $delIndex, array $arrayData, $dataVariable)
|
public function create($applicationUid, $delIndex, array $arrayData, $dataVariable = [])
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$cnn = Propel::getConnection(AppAssignSelfServiceValuePeer::DATABASE_NAME);
|
$cnn = Propel::getConnection(AppAssignSelfServiceValuePeer::DATABASE_NAME);
|
||||||
|
|||||||
@@ -571,7 +571,8 @@ class Language extends BaseLanguage
|
|||||||
$buildhash = file_get_contents($buildhash);
|
$buildhash = file_get_contents($buildhash);
|
||||||
|
|
||||||
$michelangeloFE = PATH_HTML . "lib/js";
|
$michelangeloFE = PATH_HTML . "lib/js";
|
||||||
$pathFileMafe = array_pop(glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE));
|
$array = glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE);
|
||||||
|
$pathFileMafe = array_pop($array);
|
||||||
if (file_exists($pathFileMafe) && is_readable($pathFileMafe)) {
|
if (file_exists($pathFileMafe) && is_readable($pathFileMafe)) {
|
||||||
$labels = self::readLabelsDirectory($pathFileMafe, true);
|
$labels = self::readLabelsDirectory($pathFileMafe, true);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user