Skip to content

Commit

Permalink
Merge pull request #1055 from oat-sa/release-7.22.1
Browse files Browse the repository at this point in the history
Release 7.22.1
  • Loading branch information
jsconan authored Nov 4, 2016
2 parents d2b3e71 + 52ca747 commit fc60768
Show file tree
Hide file tree
Showing 58 changed files with 5,192 additions and 869 deletions.
2 changes: 1 addition & 1 deletion helpers/class.File.php
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ public static function getMimeType($path, $ext = false)
$mimetype = '';
}

if (!in_array($ext, array('css', 'ogg'))) {
if (!in_array($ext, array('css', 'ogg', 'mp3'))) {
if (file_exists($path)) {
if (function_exists('finfo_open')) {
$finfo = finfo_open(FILEINFO_MIME);
Expand Down
4 changes: 2 additions & 2 deletions manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
'label' => 'Tao base',
'description' => 'TAO meta-extension',
'license' => 'GPL-2.0',
'version' => '7.18.4',
'version' => '7.22.1',
'author' => 'Open Assessment Technologies, CRP Henri Tudor',
'requires' => array(
'generis' => '>=3.0.1',
'generis' => '>=3.6.0',
),
'models' => array(
'http://www.tao.lu/Ontologies/TAO.rdf',
Expand Down
32 changes: 32 additions & 0 deletions models/classes/metadata/exception/InconsistencyConfigException.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\exception;

/**
* Class InconsistencyConfigException
* Exception to handle error at config parsing
*
* @package oat\tao\model\metadata\exception
*/
class InconsistencyConfigException extends \common_Exception
{

}
26 changes: 26 additions & 0 deletions models/classes/metadata/exception/MetadataImportException.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\exception;

class MetadataImportException extends \common_Exception
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\exception\injector;

class MetadataInjectorReadException extends \common_Exception
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\exception\injector;

class MetadataInjectorWriteException extends \common_Exception
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\exception\reader;

class MetadataReaderNotFoundException extends \common_Exception
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\exception\writer;

class MetadataWriterException extends \common_Exception
{

}
39 changes: 39 additions & 0 deletions models/classes/metadata/import/MetadataImporter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php
/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
*
*/

namespace oat\tao\model\metadata\import;

/**
* Interface MetadataImporter
* Representing the service to export Metadata
*
* @author Camille Moyon
* @package oat\tao\model\metadata\import
*/
interface MetadataImporter
{
/**
* Main method to import Iterator data to Ontology object
*
* @param array $data
* @return \common_report_Report
*/
public function import(array $data, $dryrun = false);
}
Loading

0 comments on commit fc60768

Please sign in to comment.