Fixes CLI installer.

1.10.x
Julio Montoya 10 years ago
parent bfda337488
commit 0cd3d4c95a
  1. 1
      README.md
  2. 14
      app/bootstrap.php.cache
  3. 4
      app/config/assetic.yml
  4. 4
      app/config/parameters.yml.dist
  5. 62
      app/config/sonata/sonata_admin.yml
  6. 4
      composer.json
  7. 40
      src/Application/Sonata/ClassificationBundle/Entity/Context.php
  8. 21
      src/Application/Sonata/ClassificationBundle/Resources/config/doctrine/Context.orm.xml
  9. 6
      src/Chamilo/CourseBundle/ToolChain.php
  10. 15
      src/Chamilo/InstallerBundle/Form/Type/Configuration/DatabaseType.php
  11. 1
      src/Chamilo/InstallerBundle/Form/Type/ConfigurationType.php
  12. 1
      src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml
  13. 1
      src/Chamilo/InstallerBundle/Validator/Constraints/DatabaseConnectionValidator.php
  14. 4
      web/install.php

@ -90,6 +90,7 @@ Browser install:
git clone https://github.com/chamilo/chamilo-lms.git chamilo
cd chamilo
composer update
app/console doctrine:database:create
```
Load localhost/chamilo/install.php in your browser and follow the instructions.

@ -594,7 +594,7 @@ if (!$dup->get('_format') && $this->get('_format')) {
$dup->attributes->set('_format', $this->get('_format'));
}
if (!$dup->getRequestFormat(null)) {
$dup->setRequestFormat($format = $this->getRequestFormat(null));
$dup->setRequestFormat($this->getRequestFormat(null));
}
return $dup;
}
@ -1144,7 +1144,7 @@ $requestUri = $this->getRequestUri();
if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) {
return $prefix;
}
if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, dirname($baseUrl))) {
if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, dirname($baseUrl).'/')) {
return rtrim($prefix,'/');
}
$truncatedRequestUri = $requestUri;
@ -1355,7 +1355,7 @@ $this->headers = clone $this->headers;
public function prepare(Request $request)
{
$headers = $this->headers;
if ($this->isInformational() || in_array($this->statusCode, array(204, 304))) {
if ($this->isInformational() || $this->isEmpty()) {
$this->setContent(null);
$headers->remove('Content-Type');
$headers->remove('Content-Length');
@ -2284,6 +2284,7 @@ use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\HttpKernel\Config\EnvParametersResource;
use Symfony\Component\HttpKernel\Config\FileLocator;
use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
use Symfony\Component\HttpKernel\DependencyInjection\AddClassesToCachePass;
@ -2303,11 +2304,11 @@ protected $booted = false;
protected $name;
protected $startTime;
protected $loadClassCache;
const VERSION ='2.6.3';
const VERSION_ID ='20603';
const VERSION ='2.6.4';
const VERSION_ID ='20604';
const MAJOR_VERSION ='2';
const MINOR_VERSION ='6';
const RELEASE_VERSION ='3';
const RELEASE_VERSION ='4';
const EXTRA_VERSION ='';
public function __construct($environment, $debug)
{
@ -2612,6 +2613,7 @@ if (null !== $cont = $this->registerContainerConfiguration($this->getContainerLo
$container->merge($cont);
}
$container->addCompilerPass(new AddClassesToCachePass($this));
$container->addResource(new EnvParametersResource('SYMFONY__'));
return $container;
}
protected function prepareContainer(ContainerBuilder $container)

@ -157,8 +157,8 @@ assetic:
- %kernel.root_dir%/../web/bundles/sonataadmin/jquery/jquery.form.js
- %kernel.root_dir%/../web/bundles/sonataadmin/jquery/jquery.confirmExit.js
- %kernel.root_dir%/../web/bundles/sonataadmin/App.js
- %kernel.root_dir%/../web/bundles/sonataadmin/treeview.js
- %kernel.root_dir%/../web/bundles/sonatapage/sonata-page.back.js
# - %kernel.root_dir%/../web/bundles/sonataadmin/treeview.js
# - %kernel.root_dir%/../web/bundles/sonatapage/sonata-page.back.js
- %kernel.root_dir%/../web/bundles/sonataadmin/Admin.js
filters:
- yui_js

@ -12,10 +12,6 @@ parameters:
locale: en
secret: ThisTokenIsNotSoSecretChangeIt
installed: ~
path.data: null
path.temp: null
path.courses: null
path.logs: null
security_key: null
password_encryption: sha1
deny_delete_users: false

@ -121,34 +121,34 @@ sonata_admin:
items:
- sonata.admin.access_url
# assets:
# stylesheets:
# # The sandbox includes default pre-optimized version of some css and js
# # So you can either use them, and add your custom assets here
# # ~ or ~
# # tweak the assetic.yml and the following lines
# - assetic/sonata_admin_css.css
# - assetic/sonata_formatter_css.css
# - assetic/sonata_jqueryui_css.css
# #- bundles/sonatademo/css/demo.css
#
# - bundles/sonataformatter/markitup/skins/sonata/style.css
# - bundles/sonataformatter/markitup/sets/markdown/style.css
# - bundles/sonataformatter/markitup/sets/html/style.css
# - bundles/sonataformatter/markitup/sets/textile/style.css
## - bundles/sonataadmin/vendor/bootstrap/dist/css/bootstrap.min.css
## - bundles/sonataadmin/vendor/AdminLTE/css/font-awesome.min.css
## - bundles/sonataadmin/vendor/AdminLTE/css/ionicons.min.css
## - bundles/sonataadmin/vendor/AdminLTE/css/AdminLTE.css
## - bundles/sonataadmin/vendor/jqueryui/themes/flick/jquery-ui.min.css
## - bundles/sonataadmin/vendor/select2/select2.css
## - bundles/sonataadmin/vendor/select2/select2-bootstrap.css
## - bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css
## - bundles/sonataadmin/css/styles.css
## - bundles/sonataadmin/css/layout.css
#
# javascripts:
# - assetic/sonata_admin_js.js
# - assetic/sonata_jqueryui_js.js
# - assetic/sonata_formatter_js.js
# - bundles/sonataformatter/vendor/ckeditor/ckeditor.js
assets:
stylesheets:
# The sandbox includes default pre-optimized version of some css and js
# So you can either use them, and add your custom assets here
# ~ or ~
# tweak the assetic.yml and the following lines
- assetic/sonata_admin_css.css
- assetic/sonata_formatter_css.css
- assetic/sonata_jqueryui_css.css
#- bundles/sonatademo/css/demo.css
- bundles/sonataformatter/markitup/skins/sonata/style.css
- bundles/sonataformatter/markitup/sets/markdown/style.css
- bundles/sonataformatter/markitup/sets/html/style.css
- bundles/sonataformatter/markitup/sets/textile/style.css
# - bundles/sonataadmin/vendor/bootstrap/dist/css/bootstrap.min.css
# - bundles/sonataadmin/vendor/AdminLTE/css/font-awesome.min.css
# - bundles/sonataadmin/vendor/AdminLTE/css/ionicons.min.css
# - bundles/sonataadmin/vendor/AdminLTE/css/AdminLTE.css
# - bundles/sonataadmin/vendor/jqueryui/themes/flick/jquery-ui.min.css
# - bundles/sonataadmin/vendor/select2/select2.css
# - bundles/sonataadmin/vendor/select2/select2-bootstrap.css
# - bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css
# - bundles/sonataadmin/css/styles.css
# - bundles/sonataadmin/css/layout.css
javascripts:
- assetic/sonata_admin_js.js
- assetic/sonata_jqueryui_js.js
- assetic/sonata_formatter_js.js
- bundles/sonataformatter/vendor/ckeditor/ckeditor.js

@ -22,6 +22,7 @@
"main/gradebook/lib",
"main/newscorm",
"main/inc/lib",
"plugin",
"main/install",
"main/inc/lib/getid3",
"main/survey"
@ -75,7 +76,8 @@
"jms/di-extra-bundle": "~1.4",
"jms/serializer-bundle": "~0.12",
"doctrine/orm": "~2.4",
"doctrine/orm": "2.4.*@dev",
"doctrine/dbal": "2.4.4",
"doctrine/doctrine-bundle": "1.3.*@dev",
"doctrine/doctrine-migrations-bundle": "~2.0@dev",
"doctrine/migrations": "~1.0@dev",

@ -1,40 +0,0 @@
<?php
/**
* This file is part of the <name> project.
*
* (c) <yourname> <youremail>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Application\Sonata\ClassificationBundle\Entity;
use Sonata\ClassificationBundle\Entity\BaseContext as BaseContext;
/**
* This file has been generated by the Sonata EasyExtends bundle ( http://sonata-project.org/bundles/easy-extends )
*
* References :
* working with object : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/working-with-objects/en
*
* @author <yourname> <youremail>
*/
class Context extends BaseContext
{
/**
* @var integer $id
*/
protected $id;
/**
* Get id
*
* @return integer $id
*/
public function getId()
{
return $this->id;
}
}

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<!--
This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
References :
xsd : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
xml mapping : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/xml-mapping/en
association mapping : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
-->
<entity
name="Application\Sonata\ClassificationBundle\Entity\Context"
table="classification__context"
repository-class="Doctrine\ORM\EntityRepository">
<id name="id" type="string" column="id">
<generator strategy="NONE"/>
</id>
</entity>
</doctrine-mapping>

@ -4,8 +4,10 @@
namespace Chamilo\CourseBundle;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
use Chamilo\CoreBundle\Entity\Tool;
use Chamilo\CoreBundle\Entity\ToolResourceRights;
use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
use Chamilo\CourseBundle\Entity\CTool;
use Chamilo\CourseBundle\Tool\BaseTool;
use Doctrine\Common\Persistence\ObjectManager;
@ -51,13 +53,13 @@ class ToolChain
$toolResourceRight = new ToolResourceRights();
$toolResourceRight
->setRole('ROLE_TEACHER')
->setMask(ToolResourceRights::getEditorMask())
->setMask(ResourceNodeVoter::getEditorMask())
;
$toolResourceRightReader = new ToolResourceRights();
$toolResourceRightReader
->setRole('ROLE_STUDENT')
->setMask(ToolResourceRights::getReaderMask())
->setMask(ResourceNodeVoter::getReaderMask())
;
/** @var BaseTool $tool */

@ -16,6 +16,21 @@ class DatabaseType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
/*->add(
'chamilo_installer_database_driver',
'choice',
array(
'label' => 'form.configuration.database.driver',
'choices' => array(
'pdo_mysql' => 'MySQL',
'pdo_pgsql' => 'PostgreSQL',
),
'constraints' => array(
new Assert\NotBlank(),
new ExtensionLoaded(),
),
)
)*/
->add(
'chamilo_installer_database_host',
'text',

@ -16,6 +16,7 @@ class ConfigurationType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
{
// See class DatabaseConnectionValidator to see the validator.
$builder
->add(
'database',

@ -123,5 +123,6 @@ process:
install: Install
finish: Launch application
continue: Continue
refresh: Refresh
operation: Operation
status: Status

@ -17,6 +17,7 @@ class DatabaseConnectionValidator extends ConstraintValidator
'dbname' => $value['chamilo_installer_database_name'],
'user' => $value['chamilo_installer_database_user'],
'password' => $value['chamilo_installer_database_password'],
//'driver' => $value['chamilo_installer_database_driver'],
'driver' => 'pdo_mysql',
'charset' => 'UTF8',
);

@ -203,8 +203,8 @@ function iterateRequirements(array $collection, $translator) {
<div class="install-form-actions">
<?php if (count($majorProblems) || count($minorProblems)): ?>
<a href="install.php" class="btn btn-default icon-reset">
<span><?php echo $translator->trans('process.button.refresh'); ?></span>
<a href="install.php" class="btn btn-default btn-lg">
<i class="fa fa-refresh"></i> <?php echo $translator->trans('process.button.refresh'); ?>
</a>
<?php endif; ?>
<a href="<?php echo count($majorProblems) ? 'javascript: void(0);' : 'app_dev.php/installer/flow/chamilo_installer/welcome'; ?>" class="btn btn-lg btn-primary <?php echo count($majorProblems) ? 'disabled' : 'primary'; ?>">

Loading…
Cancel
Save