diff --git a/vendor/autoload.php b/vendor/autoload.php index f58bd8e5c6..1044960bb8 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitf1ee82f2567fa86f78d258bf9f6cac97::getLoader(); +return ComposerAutoloaderInitccfd96f09fad4b03f395700cf22111c8::getLoader(); diff --git a/vendor/chamilo/chash/.travis.yml b/vendor/chamilo/chash/.travis.yml new file mode 100644 index 0000000000..99f111908f --- /dev/null +++ b/vendor/chamilo/chash/.travis.yml @@ -0,0 +1,6 @@ +language: php + +php: + - 5.3 + - 5.4 + - 5.5 \ No newline at end of file diff --git a/vendor/chamilo/chash/README.md b/vendor/chamilo/chash/README.md new file mode 100644 index 0000000000..d7d2a44b89 --- /dev/null +++ b/vendor/chamilo/chash/README.md @@ -0,0 +1,88 @@ +Chamilo Shell script +==================== + +The Chamilo Shell (or "Chash") is a command-line PHP tool meant to speed up the +management of (multiple) Chamilo portals under Linux. + +To get the most out of Chash, you should move the chash.phar file to your +/usr/local/bin directory. You can do this getting inside the directory where +you put chash.phar and doing: + + chmod +x chash.phar + mv chash.phar /usr/local/bin/chash + +Then you can launch chash by moving into any Chamilo installation directory and +typing + + chash + +It will give you the details of what command you can use to run it properly. + +The most useful command to us until now has been the "chash database:sql" command, +which puts you directly into a MySQL client session. + +Building the chash.phar file +==================== + +In order to generate the executable chash.phar file. You have to set first this php setting (in your cli php configuration file) + + phar.readonly = Off + +Then you can call the php createPhar.php file. A new chash.phar file will be created. + +Remember to add execution permissions to the phar file. + + Example: + + cd chash + php -d phar.readonly=0 createPhar.php + chmod +x chash.phar + sudo mv chash.phar /usr/local/bin/chash + Then you can call the chash.phar file in your Chamilo installation + + cd /var/www/chamilo + chash + +Available commands: +==================== + + db + db:drop_databases Drops all databases from the current Chamilo install + db:dump Outputs a dump of the database + db:full_backup Generates a .tgz from the Chamilo files and database + db:restore Allows you to restore an SQL dump right into the active database of a given Chamilo installation (which will also erase all previous data in that database) + db:sql_cli Enters to the SQL command line + db:sql_count Count the number of rows in a specific table + + files + files:clean_archives Cleans the archives directory + + translation + translation:export_language Exports a Chamilo language package + translation:import_language Import a Chamilo language package + +Usage +==================== + +Inside a chamilo folder execute db:sql_cli in order to enter to the SQL client of the Chamilo database: + + chash.phar db:sql_cli + + +Licensing +========= + +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, either version 3 of the License, or +(at your option) any later version. + +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, see . + +Mail: info@chamilo.org \ No newline at end of file diff --git a/vendor/chamilo/chash/chash.phar b/vendor/chamilo/chash/chash.phar new file mode 100755 index 0000000000..6d17c0b0be Binary files /dev/null and b/vendor/chamilo/chash/chash.phar differ diff --git a/vendor/chamilo/chash/chash.php b/vendor/chamilo/chash/chash.php new file mode 100755 index 0000000000..8dfc4ebe23 --- /dev/null +++ b/vendor/chamilo/chash/chash.php @@ -0,0 +1,160 @@ + + * @author Julio Montoya + * @version 2.0 + * @license This script is provided under the terms of the GNU/GPLv3+ license + */ + +/** + * Security check: do not allow any other calling method than command-line + */ + +if (PHP_SAPI != 'cli') { + die("Chash cannot be called by any other method than the command line."); +} + +require __DIR__.'/vendor/autoload.php'; + +use Symfony\Component\Console\Application; + +$helpers = array( + 'configuration' => new Chash\Helpers\ConfigurationHelper() +); + +$application = new Application('Chamilo Command Line Interface', '1.0'); + +$helperSet = $application->getHelperSet(); +foreach ($helpers as $name => $helper) { + $helperSet->set($helper, $name); +} + +$application->addCommands(array( + new Chash\Command\Database\RunSQLCommand(), + new Chash\Command\Database\DumpCommand(), + new Chash\Command\Database\RestoreCommand(), + new Chash\Command\Database\SQLCountCommand(), + new Chash\Command\Database\FullBackupCommand(), + new Chash\Command\Database\DropDatabaseCommand(), + new Chash\Command\Files\CleanTempFolderCommand(), + new Chash\Command\Files\CleanConfigFiles(), + new Chash\Command\Translation\ExportLanguageCommand(), + new Chash\Command\Translation\ImportLanguageCommand() +)); + +$application->run(); + +//Interactive shell +//$shell = new Console\Shell($application); +//$shell->run(); + +/** + * Initialization: find the local Chamilo configuration file or thow error + */ +if (!$config_file = _chash_find_config_file()) { + die(_t( + "Couldn't find config file. Please either give the path to the Chamilo installation you want to act on, through the -c option, or 'cd' into a valid Chamilo installation directory" + )); +} + +/** + * Helper functions + */ +/** + * Shows the usage documentation (all possible commands and the general syntax + */ +function _chash_usage() +{ + echo "\n"; + echo _t( + "ChaSh goes for \"Chamilo Shell\".\nIt allows you to execute common administrative operations on a Chamilo LMS installation (1.9 or higher) from the command line." + )."\n"; + echo _t( + "ChaSh is developed by BeezNest, the Chamilo specialist corporation. See http://www.beeznest.com/ for contact details." + )."\n"; + echo _t( + 'You can call chash.php with a series of commands. Each command has its own parameters. To run chash.php, you can either call it from inside a Chamilo directory (it will then find its way on its own) or from any other directory giving the path to the configuration file with --conf=/path/to/configuration.php' + )."\n\n"; + echo _t(' Usage: php5 chash.php [command] [options]')."\n\n"; + // -- Commands explanation -- + echo _t('Available commands:')."\n"; + echo _t(" sql_cli\t\tEnters to the SQL command line")."\n"; + echo _t(" sql_dump\t\tOutputs a dump of the database")."\n"; + echo _t(" sql_restore\t\tInserts a database dump into the active database")."\n"; + echo _t(" sql_count\t\tOutputs a report about the number of rows in a table")."\n"; + echo _t(" full_backup\t\tGenerates a .tgz from the Chamilo files and database")."\n"; + echo _t(" clean_archives\tCleans the archives directory")."\n"; + echo _t(" drop_databases\tDrops all databases from the current Chamilo install")."\n"; + echo _t(" export_language_package\tGenerates a .tgz file with all the translations for a wanted language")."\n"; + echo _t(" import_language_package\tImports .tgz file previously created")."\n"; + echo "\n"; + echo _t("Available options:")."\n"; + echo _t(" --conf=\tIndicates to chash where to find the configuration file of Chamilo.")."\n"; + echo "\n"; +} + + +/** + * Find the complete path to the Chamilo configuration file + * @return string Path to the configuration file + */ +function _chash_find_config_file() +{ + global $argc, $argv; + $found = false; + if ($argc > 1) { + $find = '--conf='; + foreach ($argv as $arg) { + if (substr($arg, 0, 7) == $find) { + if (is_file(substr($arg, 7))) { + $found = substr($arg, 7); + break; + } + if (substr($arg, -1, 1) == '/') { + $arg = substr($arg, 0, -1); + } + if (is_file(substr($arg, 7).'/configuration.php')) { + $found = substr($arg, 7).'/configuration.php'; + break; + } + if (is_file(substr($arg, 7).'/main/inc/conf/configuration.php')) { + $found = substr($arg, 7).'/main/inc/conf/configuration.php'; + break; + } + } + } + } + if (!$found) { + $dir = getcwd(); + for ($i = 0; $i < 10; $i++) { + $dir = realpath($dir); + if (is_file($dir.'/configuration.php')) { + $found = $dir.'/configuration.php'; + break; + } elseif (is_file($dir.'/conf/configuration.php')) { + $found = $dir.'/conf/configuration.php'; + break; + } elseif (is_file($dir.'/inc/conf/configuration.php')) { + $found = $dir.'/inc/conf/configuration.php'; + break; + } elseif (is_file($dir.'/main/inc/conf/configuration.php')) { + $found = $dir.'/main/inc/conf/configuration.php'; + break; + } else { + $dir = $dir.'/../'; + } + } + } + return $found; +} + +function _t($var) +{ + return $var; +} \ No newline at end of file diff --git a/vendor/chamilo/chash/composer.json b/vendor/chamilo/chash/composer.json new file mode 100644 index 0000000000..b3c798be97 --- /dev/null +++ b/vendor/chamilo/chash/composer.json @@ -0,0 +1,14 @@ +{ + "name": "chamilo/chash", + "autoload": { + "psr-0": { + "Chash": "src/" + } + }, + "require": { + "php": ">=5.3.2", + "symfony/console": "2.3.*@dev", + "symfony/yaml" : "2.1.*" + }, + "minimum-stability": "dev" +} \ No newline at end of file diff --git a/vendor/chamilo/chash/composer.lock b/vendor/chamilo/chash/composer.lock new file mode 100644 index 0000000000..3e490f680c --- /dev/null +++ b/vendor/chamilo/chash/composer.lock @@ -0,0 +1,110 @@ +{ + "hash": "1bea5cc52d392819dc48a5b9caa6a96b", + "packages": [ + { + "name": "symfony/console", + "version": "dev-master", + "target-dir": "Symfony/Component/Console", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console.git", + "reference": "ce8d34ee8b1abc7c0f3d0923fdb32a85e7decb98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Console/zipball/ce8d34ee8b1abc7c0f3d0923fdb32a85e7decb98", + "reference": "ce8d34ee8b1abc7c0f3d0923fdb32a85e7decb98", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Console\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "http://symfony.com", + "time": "2013-03-23 07:15:46" + }, + { + "name": "symfony/yaml", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml.git", + "reference": "1238ede850fb8c6946a6c44963d38bbf9cad6dd1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/1238ede850fb8c6946a6c44963d38bbf9cad6dd1", + "reference": "1238ede850fb8c6946a6c44963d38bbf9cad6dd1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com", + "time": "2013-03-23 01:54:33" + } + ], + "packages-dev": [ + + ], + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "symfony/console": 20 + }, + "platform": { + "php": ">=5.3.2" + }, + "platform-dev": [ + + ] +} diff --git a/vendor/chamilo/chash/createPhar.php b/vendor/chamilo/chash/createPhar.php new file mode 100644 index 0000000000..dea8353775 --- /dev/null +++ b/vendor/chamilo/chash/createPhar.php @@ -0,0 +1,21 @@ +setSignatureAlgorithm(\Phar::SHA1); +$phar->startBuffering(); + +$phar->buildFromDirectory(__DIR__, '/\.php$/'); + +$defaultStub = $phar->createDefaultStub('chash.php'); + +// Create a custom stub to add the shebang +$stub = "#!/usr/bin/env php \n".$defaultStub; + +// Add the stub +$phar->setStub($stub); + +$phar->stopBuffering(); \ No newline at end of file diff --git a/vendor/chamilo/chash/license.html b/vendor/chamilo/chash/license.html new file mode 100644 index 0000000000..6978d0c0ea --- /dev/null +++ b/vendor/chamilo/chash/license.html @@ -0,0 +1,708 @@ + + + + Chamilo License + + +
+ +

GNU GENERAL PUBLIC LICENSE

+

Version 3, 29 June 2007

+ +

Copyright © 2007 Free Software Foundation, Inc. + <http://fsf.org/>

+ Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed.

+ +

Preamble

+ +

The GNU General Public License is a free, copyleft license for +software and other kinds of works.

+ +

The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too.

+ +

When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things.

+ +

To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others.

+ +

For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights.

+ +

Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.

+ +

For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.

+ +

Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users.

+ +

Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free.

+ +

The precise terms and conditions for copying, distribution and +modification follow.

+ +

TERMS AND CONDITIONS

+ +

0. Definitions.

+ +

“This License” refers to version 3 of the GNU General Public License.

+ +

“Copyright” also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks.

+ +

“The Program” refers to any copyrightable work licensed under this +License. Each licensee is addressed as “you”. “Licensees” and + +“recipients” may be individuals or organizations.

+ +

To “modify” a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a “modified version” of the +earlier work or a work “based on” the earlier work.

+ +

A “covered work” means either the unmodified Program or a work based +on the Program.

+ +

To “propagate” a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well.

+ +

To “convey” a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying.

+ +

An interactive user interface displays “Appropriate Legal Notices” +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion.

+ +

1. Source Code.

+ +

The “source code” for a work means the preferred form of the work +for making modifications to it. “Object code” means any non-source +form of a work.

+ +

A “Standard Interface” means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language.

+ +

The “System Libraries” of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +“Major Component”, in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it.

+ +

The “Corresponding Source” for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work.

+ +

The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source.

+ +

The Corresponding Source for a work in source code form is that +same work.

+ +

2. Basic Permissions.

+ +

All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law.

+ +

You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you.

+ +

Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary.

+ +

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

+ +

No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures.

+ +

When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures.

+ +

4. Conveying Verbatim Copies.

+ +

You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program.

+ +

You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee.

+ +

5. Conveying Modified Source Versions.

+ +

You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions:

+ +
    +
  • a) The work must carry prominent notices stating that you modified + it, and giving a relevant date.
  • + +
  • b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + “keep intact all notices”.
  • + +
  • c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it.
  • + +
  • d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so.
  • +
+ +

A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +“aggregate” if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate.

+ +

6. Conveying Non-Source Forms.

+ +

You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways:

+ +
    +
  • a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange.
  • + +
  • b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge.
  • + +
  • c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b.
  • + +
  • d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements.
  • + +
  • e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d.
  • +
+ +

A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work.

+ +

A “User Product” is either (1) a “consumer product”, which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, “normally used” refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product.

+ +

“Installation Information” for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made.

+ +

If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM).

+ +

The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network.

+ +

Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying.

+ +

7. Additional Terms.

+ +

“Additional permissions” are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions.

+ +

When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission.

+ +

Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms:

+ +
    +
  • a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or
  • + +
  • b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or
  • + +
  • c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or
  • + +
  • d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or
  • + +
  • e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or
  • + +
  • f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors.
  • +
+ +

All other non-permissive additional terms are considered “further +restrictions” within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying.

+ +

If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms.

+ +

Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way.

+ +

8. Termination.

+ +

You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11).

+ +

However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation.

+ +

Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice.

+ +

Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10.

+ +

9. Acceptance Not Required for Having Copies.

+ +

You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so.

+ +

10. Automatic Licensing of Downstream Recipients.

+ +

Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License.

+ +

An “entity transaction” is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts.

+ +

You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it.

+ +

11. Patents.

+ +

A “contributor” is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's “contributor version”.

+ +

A contributor's “essential patent claims” are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, “control” includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License.

+ +

Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version.

+ +

In the following three paragraphs, a “patent license” is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To “grant” such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party.

+ +

If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. “Knowingly relying” means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid.

+ + +

If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it.

+ +

A patent license is “discriminatory” if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007.

+ +

Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law.

+ +

12. No Surrender of Others' Freedom.

+ +

If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program.

+ +

13. Use with the GNU Affero General Public License.

+ +

Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such.

+ +

14. Revised Versions of this License.

+ +

The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns.

+ +

Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License “or any later version” applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation.

+ +

If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program.

+ +

Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.

+ +

15. Disclaimer of Warranty.

+ +

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+ +

16. Limitation of Liability.

+ +

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.

+ +

17. Interpretation of Sections 15 and 16.

+ +

If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee.

+ +

END OF TERMS AND CONDITIONS

+ +

How to Apply These Terms to Your New Programs

+ +

If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms.

+ +

To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the “copyright” line and a pointer to where the full notice is found.

+ +
    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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, either version 3 of the License, or
+    (at your option) any later version.
+
+    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, see <http://www.gnu.org/licenses/>.
+
+ +

Also add information on how to contact you by electronic and paper mail.

+ +

If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode:

+ +
    <program>  Copyright (C) <year>  <name of author>
+
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+ +

The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an “about box”.

+ +

You should also get your employer (if you work as a programmer) or school, +if any, to sign a “copyright disclaimer” for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>.

+ +

The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+ + +
+ + Valid XHTML 1.0 Transitional + + Valid CSS + + + diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/CommonChamiloDatabaseCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/CommonChamiloDatabaseCommand.php new file mode 100644 index 0000000000..779c718785 --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/CommonChamiloDatabaseCommand.php @@ -0,0 +1,31 @@ +addOption( + 'conf', + null, + InputOption::VALUE_NONE, + 'Set a configuration file' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $configuration = $input->getOption('conf'); + $this->getHelper('configuration')->readConfigurationFile($configuration); + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/DropDatabaseCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/DropDatabaseCommand.php new file mode 100644 index 0000000000..8d6153f232 --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/DropDatabaseCommand.php @@ -0,0 +1,65 @@ +setName('db:drop_databases') + ->setDescription('Drops all databases from the current Chamilo install'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + + $dialog = $this->getHelperSet()->get('dialog'); + + if (!$dialog->askConfirmation( + $output, + 'Are you sure you want to drop all database in this portal? (y/N)', + false + ) + ) { + return; + } + + if (!$dialog->askConfirmation( + $output, + 'Really sure? (y/N)', + false + ) + ) { + return; + } + + $_configuration = $this->getHelper('configuration')->getConfiguration(); + $connection = $this->getHelper('configuration')->getConnection(); + + if ($connection) { + $cmd = 'mysql -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p'.$_configuration['db_password'].' -e "DROP DATABASE %s"'; + $list = $_configuration = $this->getHelper('configuration')->getAllDatabases(); + if (is_array($list)) { + $output->writeln('Starting Chamilo process'); + foreach ($list as $db) { + $c = sprintf($cmd, $db); + $output->writeln("Dropping DB: $db"); + $err = @system($c); + } + $output->writeln('End Chamilo process'); + } + } else { + $output->writeln("Can't stablished connection with the database"); + } + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/DumpCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/DumpCommand.php new file mode 100644 index 0000000000..6f7a9492e0 --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/DumpCommand.php @@ -0,0 +1,39 @@ +setName('db:dump') + ->setDescription('Outputs a dump of the database'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + $_configuration = $this->getHelper('configuration')->getConfiguration(); + $dump = 'mysqldump -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p'.$_configuration['db_password'].' '.$_configuration['main_database']; + system($dump); + return null; + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/FullBackupCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/FullBackupCommand.php new file mode 100644 index 0000000000..922a300276 --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/FullBackupCommand.php @@ -0,0 +1,106 @@ +setHelp( + 'The full_backup command allows you to do a full backup of the files and database of a given Chamilo installation' + ); + + $this + ->setName('db:full_backup') + ->setDescription('Generates a .tgz from the Chamilo files and database') + ->addArgument( + 'result', + InputArgument::REQUIRED, + 'Allows you to specify a destination file, e.g. database:full_backup /home/user/backup.tgz or backup.tgz' + ) + ->addOption( + 'tmp', + null, + InputOption::VALUE_OPTIONAL, + 'Allows you to specify in which temporary directory the backup files should be placed (optional, defaults to /tmp)' + ) + ->addOption( + 'del-archive', + null, + InputOption::VALUE_NONE, + 'Deletes the contents of the archive/ directory before the backup is executed' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + + $_configuration = $this->getHelper('configuration')->getConfiguration(); + $resultPath = $input->getArgument('result'); + $tmpFolder = $input->getOption('tmp'); + + if (empty($tmpFolder)) { + $output->writeln( + 'No temporary directory defined. Assuming /tmp/. Please make sure you have *enough space* left on that device' + ); + $tmpFolder = '/tmp'; + } + + $deleteTemp = $input->getOption('del-archive'); + + if ($deleteTemp) { + //Calling command + $command = $this->getApplication()->find('files:clean_archives'); + + $arguments = array( + 'command' => 'files:clean_archives' + ); + $input = new ArrayInput($arguments); + $command->run($input, $output); + } else { + $output->writeln('Temp archives are not removed'); + } + + $cha_dir = realpath($_configuration['root_sys']); + + $output->writeln('Starting full backup'); + + $f = $_configuration['db_user']; + //backup the files (this requires root permissions) + $bkp_dir = $tmpFolder.'/'.$f.'-'.date('Ymdhis'); + $err = @mkdir($bkp_dir); + $tgz = $bkp_dir.'/'.$f.'.tgz'; + $sql = $bkp_dir.'/'.$f.'-db.sql'; + $err = @system('tar zcf '.$tgz.' '.$cha_dir); + + $output->writeln('Generating mysqldump'); + + $err = @system( + 'mysqldump -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p'.$_configuration['db_password'].' '.$_configuration['main_database'].' --result-file='.$sql + ); + + $output->writeln('Generating tarball '); + + $err = @system('tar zcf '.$resultPath.' '.$bkp_dir); + $err = @system('rm -rf '.$bkp_dir); + + $output->writeln( + 'End Chamilo backup. File can be found here: '.realpath($resultPath).' ' + ); + + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/RestoreCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/RestoreCommand.php new file mode 100644 index 0000000000..ac7dc5554a --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/RestoreCommand.php @@ -0,0 +1,49 @@ +setName('db:restore') + ->setDescription( + 'Allows you to restore an SQL dump right into the active database of a given Chamilo installation (which will also erase all previous data in that database)' + ) + ->addArgument( + 'file', + InputArgument::REQUIRED, + 'Specify the dump\'s full path, e.g. database:restore /tmp/dump.sql' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + $dumpPath = $input->getArgument('file'); + if (!is_dir($dumpPath) && file_exists($dumpPath)) { + $_configuration = $this->getHelper('configuration')->getConfiguration(); + + $output->writeln('Starting restoring database'); + $action = 'mysql -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p'.$_configuration['db_password'].' '.$_configuration['main_database'].' < '.$dumpPath; + system($action); + $output->writeln('Process ended succesfully'); + } else { + $output->writeln('File is not a valid SQL file: '.$dumpPath.' '); + } + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/RunSQLCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/RunSQLCommand.php new file mode 100644 index 0000000000..af0c09e5a2 --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/RunSQLCommand.php @@ -0,0 +1,63 @@ +setName('db:sql_cli') + ->setDescription('Enters to the SQL command line'); + $this->setHelp('Prompts a SQL cli'); + + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + $output->writeln('Starting Chamilo SQL cli'); + + $_configuration = $this->getHelper('configuration')->getConfiguration(); + + $cmd = 'mysql -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p'.$_configuration['db_password'].' '.$_configuration['main_database']; + $process = proc_open($cmd, array(0 => STDIN, 1 => STDOUT, 2 => STDERR), $pipes); + $proc_status = proc_get_status($process); + $exit_code = proc_close($process); + return ($proc_status["running"] ? $exit_code : $proc_status["exitcode"]); + + /*$output->writeln('Starting Chamilo process'); + $output->writeln('Chamilo process ended succesfully'); + */ + /* + $progress = $this->getHelperSet()->get('progress'); + + $progress->start($output, 50); + $i = 0; + while ($i++ < 50) { + // ... do some work + + // advance the progress bar 1 unit + $progress->advance(); + } + $progress->finish();*/ + + // Inside execute function + //$output->getFormatter()->setStyle('fcbarcelona', new OutputFormatterStyle('red', 'blue', array('blink', 'bold', 'underscore'))); + //$output->writeln('Messi for the win'); + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Database/SQLCountCommand.php b/vendor/chamilo/chash/src/Chash/Command/Database/SQLCountCommand.php new file mode 100644 index 0000000000..57f23c7ce5 --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Database/SQLCountCommand.php @@ -0,0 +1,51 @@ +setName('db:sql_count') + ->setDescription('Count the number of rows in a specific table') + ->addArgument( + 'table', + InputArgument::REQUIRED, + 'Name of the table' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + $table = $input->getArgument('table'); + $_configuration = $this->getHelper('configuration')->getConfiguration(); + $connection = $this->getHelper('configuration')->getConnection(); + + $t = mysql_real_escape_string($table); + $q = mysql_query('SELECT COUNT(*) FROM '.$t); + if ($q !== false) { + $r = mysql_fetch_row($q); + $n = $r[0]; + $output->writeln( + 'Database/table/number of rows: '.$_configuration['main_database'].'/'.$t.'/'.$n.'' + ); + } else { + $output->writeln( + "Table '$table' does not exists in the database: ".$_configuration['main_database'] + ); + } + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Files/CleanConfigFiles.php b/vendor/chamilo/chash/src/Chash/Command/Files/CleanConfigFiles.php new file mode 100644 index 0000000000..6c8d78fb1f --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Files/CleanConfigFiles.php @@ -0,0 +1,65 @@ +setName('files:clean_config_files') + ->setDescription('Cleans the archives directory'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + + $output->writeln('Starting cleaning your Chamilo installation'); + + $dialog = $this->getHelperSet()->get('dialog'); + + if (!$dialog->askConfirmation( + $output, + 'Are you sure you want to clean your config files? (y/N)', + false + ) + ) { + return; + } + + $filesToDelete = $this->getHelper('configuration')->getConfigFiles(); + + if (!empty($filesToDelete)) { + foreach ($filesToDelete as $file) { + if (isset($file) && file_exists($file) && is_file($file)) { + if (!$dialog->askConfirmation( + $output, + "Are you sure you want to delete: $file (y/N)", + false + ) + ) { + return; + } + unlink($file); + $output->writeln("File deleted: $file"); + } + } + } else { + $output->writeln("Nothing to delete"); + } + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Files/CleanTempFolderCommand.php b/vendor/chamilo/chash/src/Chash/Command/Files/CleanTempFolderCommand.php new file mode 100644 index 0000000000..bf41e03e3a --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Files/CleanTempFolderCommand.php @@ -0,0 +1,67 @@ +setName('files:clean_archives') + ->setDescription('Cleans the archives directory'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + $output->writeln('Starting Clean temp folders '); + + $dialog = $this->getHelperSet()->get('dialog'); + + if (!$dialog->askConfirmation( + $output, + 'Are you sure you want to clean the Chamilo temp files? (y/N)', + false + ) + ) { + return; + } + + $_configuration = $this->getHelper('configuration')->getConfiguration(); + + if (empty($_configuration['root_sys'])) { + $output->writeln( + '$_configuration[\'root_sys\'] is empty. In these conditions, it is too dangerous to proceed with the deletion. Please ensure this variable is defined in main/inc/conf/configuration.php' + ); + return false; + } + + $dir = $_configuration['root_sys'].'archive'; + $files = scandir($dir); + foreach ($files as $file) { + if (substr($file, 0, 1) == '.') { + //ignore + } elseif ($file == 'twig') { + $err = @system('rm -rf '.$dir.'/twig/*'); + } elseif ($file == 'Serializer') { + $err = @system('rm -rf '.$dir.'/Serializer/*'); + } else { + $err = @system('rm -rf '.$dir.'/'.$file); + } + } + $output->writeln('Files were cleaned'); + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Translation/ExportLanguageCommand.php b/vendor/chamilo/chash/src/Chash/Command/Translation/ExportLanguageCommand.php new file mode 100644 index 0000000000..857ce16c9f --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Translation/ExportLanguageCommand.php @@ -0,0 +1,107 @@ +setName('translation:export_language') + ->setDescription('Exports a Chamilo language package') + ->addArgument( + 'language', + InputArgument::REQUIRED, + 'Which language you want to export' + ) + ->addOption( + 'tmp', + null, + InputOption::VALUE_OPTIONAL, + 'Allows you to specify in which temporary directory the backup files should be placed (optional, defaults to /tmp)' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + + $language = $input->getArgument('language'); + $tmpFolder = $input->getOption('tmp'); + + $_configuration = $this->getHelper('configuration')->getConfiguration(); + + $connection = $this->getHelper('configuration')->getConnection(); + + if ($connection) { + $lang = isset($language) ? $language : null; + + $lang = mysql_real_escape_string($lang); + + $q = mysql_query("SELECT * FROM language WHERE english_name = '$lang' "); + $langInfo = mysql_fetch_array($q, MYSQL_ASSOC); + + if (!$langInfo) { + + $output->writeln("Language '$lang' is not registered in the Chamilo Database"); + + $q = mysql_query("SELECT * FROM language WHERE parent_id IS NULL or parent_id = 0"); + $output->writeln("Available languages are: "); + while ($langRow = mysql_fetch_array($q, MYSQL_ASSOC)) { + $output->write($langRow['english_name'].", "); + } + $output->writeln(' '); + + $q = mysql_query("SELECT * FROM language WHERE parent_id <> 0"); + $output->writeln("Available sub languages are: "); + while ($langRow = mysql_fetch_array($q, MYSQL_ASSOC)) { + $output->write($langRow['english_name'].", "); + } + $output->writeln(' '); + exit; + } else { + $output->writeln( + "Language '$lang' is registered in the Chamilo installation with iso code: {$langInfo['isocode']} " + ); + } + + $langFolder = $_configuration['root_sys'].'main/lang/'.$lang; + + if (!is_dir($langFolder)) { + $output->writeln("Language '$lang' does not exist in the path: $langFolder"); + } + + if (empty($tmpFolder)) { + $tmpFolder = '/tmp/'; + $output->writeln( + "No temporary directory defined. Assuming /tmp/. Please make sure you have *enough space* left on that device" + ); + } + + if (!is_dir($tmpFolder)) { + $output->writeln( + "Temporary directory: $tmpFolder is not a valid dir path, using /tmp/ " + ); + $tmpFolder = '/tmp/'; + } + + if ($langInfo) { + $output->writeln("Creating translation package"); + $fileName = $tmpFolder.$langInfo['english_name'].'.tar'; + $phar = new \PharData($fileName); + $phar->buildFromDirectory($langFolder); + + $phar->setMetadata($langInfo); + $output->writeln("File created: {$fileName}"); + } + } + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Command/Translation/ImportLanguageCommand.php b/vendor/chamilo/chash/src/Chash/Command/Translation/ImportLanguageCommand.php new file mode 100644 index 0000000000..ba5a52bcce --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Command/Translation/ImportLanguageCommand.php @@ -0,0 +1,135 @@ +setName('translation:import_language') + ->setDescription('Import a Chamilo language package') + ->addArgument( + 'file', + InputArgument::REQUIRED, + 'Path of the language package' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + parent::execute($input, $output); + + $dialog = $this->getHelperSet()->get('dialog'); + + $_configuration = $this->getHelper('configuration')->getConfiguration(); + + $file = $input->getArgument('file'); + + $connection = $this->getHelper('configuration')->getConnection(); + + if (is_file($file) && is_readable($file)) { + $phar = new \PharData($file); + if ($phar->hasMetadata()) { + $langInfo = $phar->getMetadata(); + + $connection = $this->getHelper('configuration')->getConnection(); + if ($connection) { + $q = mysql_query( + "SELECT * FROM language WHERE dokeos_folder = '{$langInfo['dokeos_folder']}' " + ); + $langInfoFromDB = mysql_fetch_array($q, MYSQL_ASSOC); + $langFolderPath = $_configuration['root_sys'].'main/lang/'.$langInfoFromDB['dokeos_folder']; + if ($langInfoFromDB && $langFolderPath) { + //Overwrite lang files + if (!$dialog->askConfirmation( + $output, + 'The '.$langInfo['original_name'].' language already exists in Chamilo. Did you want to overwrite the contents? (y/N)', + false + ) + ) { + return; + } + if (is_writable($langFolderPath)) { + $output->writeln("Trying to save files here: $langFolderPath"); + $phar->extractTo($langFolderPath, null, true); // extract all files + $output->writeln("Files were copied."); + } else { + $output->writeln( + "Make sure that this folder $langFolderPath has writable permissions or execute the script with sudo " + ); + } + } else { + //Check if parent_id exists + $parentId = ''; + if (!empty($langInfo['parent_id'])) { + $sql = "select selected_value from settings_current where variable = 'allow_use_sub_language'"; + $result = mysql_query($sql); + $subLanguageSetting = mysql_fetch_array($result, MYSQL_ASSOC); + $subLanguageSetting = $subLanguageSetting['selected_value']; + if ($subLanguageSetting == 'true') { + + $q = mysql_query( + "SELECT * FROM language WHERE id = '{$langInfo['parent_id']}' " + ); + $parentLangInfoFromDB = mysql_fetch_array($q, MYSQL_ASSOC); + if ($parentLangInfoFromDB) { + $output->writeln( + "Setting parent language: ".$parentLangInfoFromDB['original_name'] + ); + $parentId = $langInfo['parent_id']; + } else { + $output->writeln( + "The lang parent_id = {$langInfo['parent_id']} does not exist in Chamilo. Try to import first the parent language." + ); + exit; + } + } else { + $output->writeln( + "Please turn ON the sublanguage feature in this portal" + ); + exit; + } + } else { + $output->writeln("Parent language was not provided"); + } + + $q = mysql_query( + "INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available, parent_id) VALUES ( + '".$langInfo['original_name']."', + '".$langInfo['english_name']."', + '".$langInfo['isocode']."', + '".$langInfo['dokeos_folder']."', + '1', + '".$parentId."')" + ); + + if ($q) { + $output->writeln("Language inserted in the DB"); + $langFolderPath = $_configuration['root_sys'].'main/lang/'.$langInfo['dokeos_folder']; + $phar->extractTo($langFolderPath, null, true); // extract all files + $output->writeln("Files were copied here $langFolderPath "); + } else { + $output->writeln("An error ocurred while tring to create the language"); + } + + } + } + + } else { + $output->writeln("The file is not a valid Chamilo language package"); + } + } else { + $output->writeln("The file located in '$file' is not accessible"); + } + + } +} \ No newline at end of file diff --git a/vendor/chamilo/chash/src/Chash/Helpers/ConfigurationHelper.php b/vendor/chamilo/chash/src/Chash/Helpers/ConfigurationHelper.php new file mode 100644 index 0000000000..3e0e1265bf --- /dev/null +++ b/vendor/chamilo/chash/src/Chash/Helpers/ConfigurationHelper.php @@ -0,0 +1,182 @@ +getConfigurationPath($path); + + + if (!empty($confPath)) { + $confFile = $confPath.'configuration.php'; + if (file_exists($confFile)) { + require $confFile; + $this->setConfiguration($_configuration); + + return $_configuration; + } + + $confYML = $confPath.'configuration.yml'; + if (file_exists($confYML)) { + $yaml = new Parser(); + $_configuration = $yaml->parse(file_get_contents($confYML)); + + return $_configuration; + } + } + + return false; + } + + public function setConfiguration($configuration) + { + $this->configuration = $configuration; + } + + public function getConfigFiles() + { + $configFiles = array(); + + $_configuration = $this->getConfiguration(); + + $sysPath = isset($_configuration['sys_path']) ? $_configuration['sys_path'] : null; + + if (file_exists($sysPath.'main/inc/conf/configuration.php')) { + $configFiles[] = $sysPath.'main/inc/conf/configuration.php'; + } + + if (file_exists($sysPath.'main/inc/conf/configuration.yml')) { + $configFiles[] = $sysPath.'main/inc/conf/configuration.yml'; + } + + return $configFiles; + } + + /** + * Connect to the database + * @return object Database handler + */ + public function getConnection() + { + $conf = $this->getConfiguration(); + + $dbh = false; + + if (isset($conf['db_host']) && isset($conf['db_host']) && isset($conf['db_password'])) { + $dbh = mysql_connect($conf['db_host'], $conf['db_user'], $conf['db_password']); + + if (!$dbh) { + + return false; + //die('Could not connect to server: '.mysql_error()); + } + $db = mysql_select_db($conf['main_database'], $dbh); + if (!$db) { + + return false; + //die('Could not connect to database: '.mysql_error()); + } + } + return $dbh; + } + + /** + * Gets an array with all the databases (particularly useful for Chamilo <1.9) + * @return mixed Array of databases + */ + function getAllDatabases() + { + $_configuration = $this->getConfiguration(); + $dbs = array(); + + $dbs[] = $_configuration['main_database']; + + if (isset($_configuration['statistics_database']) && !in_array( + $_configuration['statistics_database'], + $dbs + ) && !empty($_configuration['statistics_database']) + ) { + $dbs[] = $_configuration['statistics_database']; + } + + if (isset($_configuration['scorm_database']) && !in_array( + $_configuration['scorm_database'], + $dbs + ) && !empty($_configuration['scorm_database']) + ) { + $dbs[] = $_configuration['scorm_database']; + } + + if (isset($_configuration['user_personal_database']) && !in_array( + $_configuration['user_personal_database'], + $dbs + ) && !empty($_configuration['user_personal_database']) + ) { + $dbs[] = $_configuration['user_personal_database']; + } + + $t = $_configuration['main_database'].'.course'; + $sql = 'SELECT db_name from '.$t; + $res = mysql_query($sql); + if (mysql_num_rows($res) > 0) { + while ($row = mysql_fetch_array($res)) { + if (!empty($row['db_name'])) { + $dbs[] = $row['db_name']; + } + } + } + return $dbs; + } + + public function getConfiguration() + { + if (empty($this->configuration)) { + $this->configuration = $this->readConfigurationFile(); + } + return $this->configuration; + } + + public function getName() + { + return 'configuration'; + } +} diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php index 27b1775047..02e699a72f 100644 --- a/vendor/composer/autoload_namespaces.php +++ b/vendor/composer/autoload_namespaces.php @@ -44,5 +44,6 @@ return array( 'Dflydev\\Silex\\Provider\\DoctrineOrm' => $vendorDir . '/dflydev/doctrine-orm-service-provider/src', 'Dflydev\\Pimple\\Provider\\DoctrineOrm' => $vendorDir . '/dflydev/doctrine-orm-service-provider/src', 'Dflydev\\Cilex\\Provider\\DoctrineOrm' => $vendorDir . '/dflydev/doctrine-orm-service-provider/src', + 'Chash' => $vendorDir . '/chamilo/chash/src/', 'ChamiloLMS' => $baseDir . '/src/', ); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 1969839fef..2974e12dba 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php generated by Composer -class ComposerAutoloaderInitf1ee82f2567fa86f78d258bf9f6cac97 +class ComposerAutoloaderInitccfd96f09fad4b03f395700cf22111c8 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitf1ee82f2567fa86f78d258bf9f6cac97 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf1ee82f2567fa86f78d258bf9f6cac97', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitccfd96f09fad4b03f395700cf22111c8', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitf1ee82f2567fa86f78d258bf9f6cac97', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitccfd96f09fad4b03f395700cf22111c8', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index cda94fe5b2..81db2a21aa 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1998,24 +1998,24 @@ }, { "name": "doctrine/dbal", - "version": "2.3.2", - "version_normalized": "2.3.2.0", + "version": "2.3.3", + "version_normalized": "2.3.3.0", "source": { "type": "git", - "url": "https://github.com/doctrine/dbal", - "reference": "2.3.2" + "url": "https://github.com/doctrine/dbal.git", + "reference": "2.3.3" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/archive/2.3.2.zip", - "reference": "2.3.2", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.3", + "reference": "2.3.3", "shasum": "" }, "require": { - "doctrine/common": "2.3.*", + "doctrine/common": ">=2.3.0,<2.5-dev", "php": ">=5.3.2" }, - "time": "2013-01-07 20:03:43", + "time": "2013-03-24 19:16:29", "type": "library", "extra": { "branch-alias": { @@ -2034,7 +2034,7 @@ ], "authors": [ { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", "homepage": "http://www.jwage.com/" }, @@ -2063,17 +2063,17 @@ }, { "name": "doctrine/orm", - "version": "2.3.2", - "version_normalized": "2.3.2.0", + "version": "2.3.3", + "version_normalized": "2.3.3.0", "source": { "type": "git", - "url": "git://github.com/doctrine/doctrine2.git", - "reference": "2.3.2" + "url": "https://github.com/doctrine/doctrine2.git", + "reference": "2.3.3" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/archive/2.3.2.zip", - "reference": "2.3.2", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.3", + "reference": "2.3.3", "shasum": "" }, "require": { @@ -2085,7 +2085,7 @@ "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "2013-01-07 20:05:04", + "time": "2013-03-24 20:43:58", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -2132,5 +2132,35 @@ "database", "orm" ] + }, + { + "name": "chamilo/chash", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/chamilo/chash.git", + "reference": "87def53dfe80a1e15ed9bceb76f7a8f01b31990e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chamilo/chash/zipball/87def53dfe80a1e15ed9bceb76f7a8f01b31990e", + "reference": "87def53dfe80a1e15ed9bceb76f7a8f01b31990e", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/console": "2.3.*@dev", + "symfony/yaml": "2.1.*" + }, + "time": "2013-03-25 18:35:52", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Chash": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/" } ] diff --git a/vendor/doctrine/dbal/.travis.yml b/vendor/doctrine/dbal/.travis.yml index da89c600c2..1a438ca27f 100644 --- a/vendor/doctrine/dbal/.travis.yml +++ b/vendor/doctrine/dbal/.travis.yml @@ -10,13 +10,13 @@ env: - DB=mysqli before_script: + - composer update --dev --prefer-source - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS doctrine_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS doctrine_tests_tmp;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database doctrine_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database doctrine_tests_tmp;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi" - sh -c "if [ '$DB' = 'mysqli' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi" - - git submodule update --init script: phpunit --configuration tests/travis/$DB.travis.xml diff --git a/vendor/doctrine/dbal/composer.json b/vendor/doctrine/dbal/composer.json index b24c254ddc..00ae9da52e 100644 --- a/vendor/doctrine/dbal/composer.json +++ b/vendor/doctrine/dbal/composer.json @@ -1,6 +1,6 @@ { "name": "doctrine/dbal", - "type": "library","version":"2.3.2", + "type": "library","version":"2.3.3", "description": "Database Abstraction Layer", "keywords": ["dbal", "database", "persistence", "queryobject"], "homepage": "http://www.doctrine-project.org", @@ -13,7 +13,7 @@ ], "require": { "php": ">=5.3.2", - "doctrine/common": "2.3.*" + "doctrine/common": ">=2.3.0,<2.5-dev" }, "autoload": { "psr-0": { "Doctrine\\DBAL": "lib/" } diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php index 71704f6be4..c4ad5d684f 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php @@ -190,6 +190,7 @@ class MySQLKeywords extends KeywordList 'PROCEDURE', 'PURGE', 'RAID0', + 'RANGE', 'READ', 'READS', 'REAL', diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php index 525286e833..9f34ba64a7 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php @@ -151,6 +151,7 @@ class OracleKeywords extends KeywordList 'MODE', 'ROWS', 'WITH', + 'RANGE', ); } } diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php index acac55bac5..c0b31c76bf 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php @@ -687,12 +687,12 @@ class SQLServerPlatform extends AbstractPlatform // Remove ORDER BY clause from $query $query = preg_replace('/\s+ORDER BY(.*)/', '', $query); - $query = preg_replace('/^SELECT\s/', '', $query); + $query = preg_replace('/\sFROM/i', ", ROW_NUMBER() OVER ($over) AS doctrine_rownum FROM", $query); $start = $offset + 1; $end = $offset + $limit; - $query = "SELECT * FROM (SELECT ROW_NUMBER() OVER ($over) AS doctrine_rownum, $query) AS doctrine_tbl WHERE doctrine_rownum BETWEEN $start AND $end"; + $query = "SELECT * FROM ($query) AS doctrine_tbl WHERE doctrine_rownum BETWEEN $start AND $end"; } } diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php index 8e3827fbea..502c0fc341 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php @@ -32,6 +32,13 @@ use Doctrine\DBAL\Connection; */ class SQLParserUtils { + const POSITIONAL_TOKEN = '\?'; + const NAMED_TOKEN = ':[a-zA-Z_][a-zA-Z0-9_]*'; + + // Quote characters within string literals can be preceded by a backslash. + const ESCAPED_SINGLE_QUOTED_TEXT = "'(?:[^'\\\\]|\\\\'|\\\\\\\\)*'"; + const ESCAPED_DOUBLE_QUOTED_TEXT = '"(?:[^"\\\\]|\\\\"|\\\\\\\\)*"'; + /** * Get an array of the placeholders in an sql statements as keys and their positions in the query string. * @@ -49,27 +56,18 @@ class SQLParserUtils return array(); } - $count = 0; - $inLiteral = false; // a valid query never starts with quotes - $stmtLen = strlen($statement); + $token = ($isPositional) ? self::POSITIONAL_TOKEN : self::NAMED_TOKEN; $paramMap = array(); - for ($i = 0; $i < $stmtLen; $i++) { - if ($statement[$i] == $match && !$inLiteral && ($isPositional || $statement[$i+1] != '=')) { - // real positional parameter detected + + foreach (self::getUnquotedStatementFragments($statement) as $fragment) { + preg_match_all("/$token/", $fragment[0], $matches, PREG_OFFSET_CAPTURE); + foreach ($matches[0] as $placeholder) { if ($isPositional) { - $paramMap[$count] = $i; + $paramMap[] = $placeholder[1] + $fragment[1]; } else { - $name = ""; - // TODO: Something faster/better to match this than regex? - for ($j = $i + 1; ($j < $stmtLen && preg_match('(([a-zA-Z0-9_]{1}))', $statement[$j])); $j++) { - $name .= $statement[$j]; - } - $paramMap[$i] = $name; // named parameters can be duplicated! - $i = $j; + $pos = $placeholder[1] + $fragment[1]; + $paramMap[$pos] = substr($placeholder[0], 1, strlen($placeholder[0])); } - ++$count; - } else if ($statement[$i] == "'" || $statement[$i] == '"') { - $inLiteral = ! $inLiteral; // switch state! } } @@ -180,4 +178,23 @@ class SQLParserUtils return array($query, $paramsOrd, $typesOrd); } -} + + /** + * Slice the SQL statement around pairs of quotes and + * return string fragments of SQL outside of quoted literals. + * Each fragment is captured as a 2-element array: + * + * 0 => matched fragment string, + * 1 => offset of fragment in $statement + * + * @param string $statement + * @return array + */ + static private function getUnquotedStatementFragments($statement) + { + $literal = self::ESCAPED_SINGLE_QUOTED_TEXT . '|' . self::ESCAPED_DOUBLE_QUOTED_TEXT; + preg_match_all("/([^'\"]+)(?:$literal)?/s", $statement, $fragments, PREG_OFFSET_CAPTURE); + + return $fragments[1]; + } +} \ No newline at end of file diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php index 425426e0fa..068d6b5dc6 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php @@ -59,10 +59,10 @@ abstract class AbstractSchemaManager * * @param \Doctrine\DBAL\Connection $conn */ - public function __construct(\Doctrine\DBAL\Connection $conn) + public function __construct(\Doctrine\DBAL\Connection $conn, AbstractPlatform $platform = null) { - $this->_conn = $conn; - $this->_platform = $this->_conn->getDatabasePlatform(); + $this->_conn = $conn; + $this->_platform = $platform ?: $this->_conn->getDatabasePlatform(); } /** diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php index 174dc11f9b..660e9f0b31 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php @@ -40,6 +40,7 @@ class SQLServerSchemaManager extends AbstractSchemaManager protected function _getPortableTableColumnDefinition($tableColumn) { $dbType = strtolower($tableColumn['TYPE_NAME']); + $dbType = strtok($dbType, '(), '); $autoincrement = false; if (stripos($dbType, 'identity')) { diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php index 207c20ffc6..e611a83665 100644 --- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php +++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.3.2'; + const VERSION = '2.3.3'; /** * Compares a Doctrine version with the current one. diff --git a/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php b/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php index 397e4cfc0c..21c42ad550 100644 --- a/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php +++ b/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php @@ -154,7 +154,7 @@ class SQLServerPlatformTest extends AbstractPlatformTestCase public function testModifyLimitQueryWithOffset() { $sql = $this->_platform->modifyLimitQuery('SELECT * FROM user ORDER BY username DESC', 10, 5); - $this->assertEquals('SELECT * FROM (SELECT ROW_NUMBER() OVER (ORDER BY username DESC) AS doctrine_rownum, * FROM user) AS doctrine_tbl WHERE doctrine_rownum BETWEEN 6 AND 15', $sql); + $this->assertEquals('SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY username DESC) AS doctrine_rownum FROM user) AS doctrine_tbl WHERE doctrine_rownum BETWEEN 6 AND 15', $sql); } public function testModifyLimitQueryWithAscOrderBy() diff --git a/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php b/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php index ce2e7ba709..ea341b1451 100644 --- a/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php +++ b/vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php @@ -28,6 +28,13 @@ class SQLParserUtilsTest extends \Doctrine\Tests\DbalTestCase array("SELECT '?' FROM foo", true, array()), array('SELECT "?" FROM foo WHERE bar = ?', true, array(32)), array("SELECT '?' FROM foo WHERE bar = ?", true, array(32)), + array( +<<<'SQLDATA' +SELECT * FROM foo WHERE bar = 'it\'s a trap? \\' OR bar = ? +AND baz = "\"quote\" me on it? \\" OR baz = ? +SQLDATA + , true, array(58, 104) + ), // named array('SELECT :foo FROM :bar', false, array(7 => 'foo', 17 => 'bar')), @@ -37,6 +44,7 @@ class SQLParserUtilsTest extends \Doctrine\Tests\DbalTestCase array('SELECT :foo_id', false, array(7 => 'foo_id')), // Ticket DBAL-231 array('SELECT @rank := 1', false, array()), // Ticket DBAL-398 array('SELECT @rank := 1 AS rank, :foo AS foo FROM :bar', false, array(27 => 'foo', 44 => 'bar')), // Ticket DBAL-398 + array('SELECT * FROM Foo WHERE bar > :start_date AND baz > :start_date', false, array(30 => 'start_date', 52 => 'start_date')) // Ticket GH-113 ); } diff --git a/vendor/doctrine/dbal/tests/Doctrine/Tests/TestInit.php b/vendor/doctrine/dbal/tests/Doctrine/Tests/TestInit.php index 65803431ef..cb4cc2786a 100644 --- a/vendor/doctrine/dbal/tests/Doctrine/Tests/TestInit.php +++ b/vendor/doctrine/dbal/tests/Doctrine/Tests/TestInit.php @@ -6,17 +6,12 @@ namespace Doctrine\Tests; error_reporting(E_ALL | E_STRICT); -require_once __DIR__ . '/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php'; - -$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib'); -$classLoader->register(); - -$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\DBAL', __DIR__ . '/../../../lib'); -$classLoader->register(); - -$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Tests', __DIR__ . '/../../'); -$classLoader->register(); - -$classLoader = new \Doctrine\Common\ClassLoader('Symfony', __DIR__ . "/../../../lib/vendor"); -$classLoader->register(); +if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) { + $loader = require_once __DIR__ . '/../../../vendor/autoload.php'; +} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) { + $loader = require __DIR__ . '/../../../vendor/autoload.php'; +} else { + throw new \RuntimeException('Could not locate composer autoloader'); +} +$loader->add('Doctrine\Tests', __DIR__ . '/../../'); diff --git a/vendor/doctrine/orm/composer.json b/vendor/doctrine/orm/composer.json index 64d415af04..a8cf0314dc 100644 --- a/vendor/doctrine/orm/composer.json +++ b/vendor/doctrine/orm/composer.json @@ -1,6 +1,6 @@ { "name": "doctrine/orm", - "type": "library","version":"2.3.2", + "type": "library","version":"2.3.3", "description": "Object-Relational-Mapper for PHP", "keywords": ["orm", "database"], "homepage": "http://www.doctrine-project.org", diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Id/IdentityGenerator.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Id/IdentityGenerator.php index ff2cd01b1b..ad6131280c 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Id/IdentityGenerator.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Id/IdentityGenerator.php @@ -28,17 +28,21 @@ use Doctrine\ORM\EntityManager; */ class IdentityGenerator extends AbstractIdGenerator { - /** @var string The name of the sequence to pass to lastInsertId(), if any. */ - private $_seqName; + /** + * The name of the sequence to pass to lastInsertId(), if any. + * + * @var string + */ + private $sequenceName; /** * @param string $seqName The name of the sequence to pass to lastInsertId() * to obtain the last generated identifier within the current * database session/connection, if any. */ - public function __construct($seqName = null) + public function __construct($sequenceName = null) { - $this->_seqName = $seqName; + $this->sequenceName = $sequenceName; } /** @@ -46,7 +50,7 @@ class IdentityGenerator extends AbstractIdGenerator */ public function generate(EntityManager $em, $entity) { - return (int)$em->getConnection()->lastInsertId($this->_seqName); + return (int)$em->getConnection()->lastInsertId($this->sequenceName); } /** diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 8f8ed4b9a9..613f94cf0e 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -178,10 +178,13 @@ class SimpleObjectHydrator extends AbstractHydrator // One solution is to load the association, but it might require extra efforts. return array('name' => $column); - default: + case (isset($this->_rsm->metaMappings[$column])): return array( 'name' => $this->_rsm->metaMappings[$column] ); + + default: + return null; } } } diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index f79eda8b9d..bf449a4506 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -19,16 +19,17 @@ namespace Doctrine\ORM\Mapping; -use ReflectionException, - Doctrine\ORM\ORMException, - Doctrine\ORM\EntityManager, - Doctrine\DBAL\Platforms, - Doctrine\ORM\Events, - Doctrine\Common\Persistence\Mapping\ReflectionService, - Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface, - Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory, - Doctrine\ORM\Id\IdentityGenerator, - Doctrine\ORM\Event\LoadClassMetadataEventArgs; +use ReflectionException; +use Doctrine\ORM\ORMException; +use Doctrine\ORM\EntityManager; +use Doctrine\DBAL\Platforms; +use Doctrine\ORM\Events; +use Doctrine\Common\Persistence\Mapping\ReflectionService; +use Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface; +use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory; +use Doctrine\ORM\Id\IdentityGenerator; +use Doctrine\ORM\Id\BigIntegerIdentityGenerator; +use Doctrine\ORM\Event\LoadClassMetadataEventArgs; /** * The ClassMetadataFactory is used to create ClassMetadata objects that contain all the @@ -418,9 +419,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory // __seq in PostgreSQL for SERIAL columns. // Not pretty but necessary and the simplest solution that currently works. $sequenceName = null; + $fieldName = $class->identifier ? $class->getSingleIdentifierFieldName() : null; if ($this->targetPlatform instanceof Platforms\PostgreSQLPlatform) { - $fieldName = $class->getSingleIdentifierFieldName(); $columnName = $class->getSingleIdentifierColumnName(); $quoted = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']); $sequenceName = $class->getTableName() . '_' . $columnName . '_seq'; @@ -435,7 +436,12 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory $sequenceName = $this->em->getConfiguration()->getQuoteStrategy()->getSequenceName($definition, $class, $this->targetPlatform); } - $class->setIdGenerator(new \Doctrine\ORM\Id\IdentityGenerator($sequenceName)); + $generator = ($fieldName && $class->fieldMappings[$fieldName]['type'] === "bigint") + ? new BigIntegerIdentityGenerator($sequenceName) + : new IdentityGenerator($sequenceName); + + $class->setIdGenerator($generator); + break; case ClassMetadata::GENERATOR_TYPE_SEQUENCE: diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index e0c6f2f17f..cba525a0c6 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1421,6 +1421,10 @@ class ClassMetadataInfo implements ClassMetadata $mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false; $mapping['isCascadeRemove'] = $mapping['orphanRemoval'] ? true : $mapping['isCascadeRemove']; + if ($mapping['orphanRemoval']) { + unset($mapping['unique']); + } + if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) { throw MappingException::illegalInverseIdentifierAssocation($this->name, $mapping['fieldName']); } diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index bc0e79e709..0be7c36bca 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -233,6 +233,7 @@ class XmlDriver extends FileDriver if (isset($mapping['version'])) { $metadata->setVersionMapping($mapping); + unset($mapping['version']); } $metadata->mapField($mapping); @@ -662,7 +663,7 @@ class XmlDriver extends FileDriver } if (isset($fieldMapping['version']) && $fieldMapping['version']) { - $mapping['version'] = $fieldMapping['version']; + $mapping['version'] = $this->evaluateBoolean($fieldMapping['version']); } if (isset($fieldMapping['column-definition'])) { diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 35631e7a1e..f339045afe 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -299,6 +299,7 @@ class YamlDriver extends FileDriver if (isset($mapping['version'])) { $metadata->setVersionMapping($mapping); + unset($mapping['version']); } $metadata->mapField($mapping); diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php b/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php index 8c306f4ab4..ed5d7dfb7b 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php @@ -805,6 +805,10 @@ final class PersistentCollection implements Collection, Selectable */ public function matching(Criteria $criteria) { + if ($this->isDirty) { + $this->initialize(); + } + if ($this->initialized) { return $this->coll->matching($criteria); } @@ -813,16 +817,10 @@ final class PersistentCollection implements Collection, Selectable throw new \RuntimeException("Matching Criteria on PersistentCollection only works on OneToMany assocations at the moment."); } - // If there are NEW objects we have to check if any of them matches the criteria - $newObjects = array(); - - if ($this->isDirty) { - $newObjects = $this->coll->matching($criteria)->toArray(); - } - - $targetClass = $this->em->getClassMetadata(get_class($this->owner)); - - $id = $targetClass->getSingleIdReflectionProperty()->getValue($this->owner); + $id = $this->em + ->getClassMetadata(get_class($this->owner)) + ->getSingleIdReflectionProperty() + ->getValue($this->owner); $builder = Criteria::expr(); $ownerExpression = $builder->eq($this->backRefFieldName, $id); $expression = $criteria->getWhereExpression(); @@ -832,7 +830,7 @@ final class PersistentCollection implements Collection, Selectable $persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']); - return new ArrayCollection(array_merge($persister->loadCriteria($criteria), $newObjects)); + return new ArrayCollection($persister->loadCriteria($criteria)); } } diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php index 7dc3fed821..60951eef21 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php @@ -104,19 +104,8 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor $updateSql .= $sqlWalker->walkUpdateItem($updateItem); - //FIXME: parameters can be more deeply nested. traverse the tree. - //FIXME (URGENT): With query cache the parameter is out of date. Move to execute() stage. if ($newValue instanceof AST\InputParameter) { - $parameterName = $newValue->name; - $parameter = $sqlWalker->getQuery()->getParameter($parameterName); - - $value = $sqlWalker->getQuery()->processParameterValue($parameter->getValue()); - $type = ($parameter->getValue() === $value) - ? $parameter->getType() - : ParameterTypeInferer::inferType($value); - - $this->_sqlParameters[$i]['parameters'][] = $value; - $this->_sqlParameters[$i]['types'][] = $type; + $this->_sqlParameters[$i][] = $newValue->name; ++$this->_numParametersInUpdateClause; } @@ -168,16 +157,18 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor ); // Execute UPDATE statements - for ($i=0, $count=count($this->_sqlStatements); $i<$count; ++$i) { - $parameters = array(); - $types = array(); - - if (isset($this->_sqlParameters[$i])) { - $parameters = isset($this->_sqlParameters[$i]['parameters']) ? $this->_sqlParameters[$i]['parameters'] : array(); - $types = isset($this->_sqlParameters[$i]['types']) ? $this->_sqlParameters[$i]['types'] : array(); + foreach ($this->_sqlStatements as $key => $statement) { + $paramValues = array(); + $paramTypes = array(); + + if (isset($this->_sqlParameters[$key])) { + foreach ($this->_sqlParameters[$key] as $parameterKey => $parameterName) { + $paramValues[] = $params[$parameterKey]; + $paramTypes[] = isset($types[$parameterKey]) ? $types[$parameterKey] : ParameterTypeInferer::inferType($params[$parameterKey]); + } } - $conn->executeUpdate($this->_sqlStatements[$i], $parameters, $types); + $conn->executeUpdate($statement, $paramValues, $paramTypes); } } catch (\Exception $exception) { // FAILURE! Drop temporary table to avoid possible collisions diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Expr/Base.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Expr/Base.php index a2bc98cc7d..0fee7b2d50 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Expr/Base.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/Expr/Base.php @@ -83,7 +83,7 @@ abstract class Base */ public function add($arg) { - if ( $arg !== null || ($arg instanceof self && $arg->count() > 0) ) { + if ( $arg !== null && (!$arg instanceof self || $arg->count() > 0) ) { // If we decide to keep Expr\Base instances, we can use this check if ( ! is_string($arg)) { $class = get_class($arg); diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php index fd40874dd6..6fb3abb03f 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php @@ -750,7 +750,10 @@ class SqlWalker implements TreeWalker $sqlParts = array(); foreach ($identificationVarDecls as $identificationVariableDecl) { - $sql = $this->walkRangeVariableDeclaration($identificationVariableDecl->rangeVariableDeclaration); + $sql = $this->platform->appendLockHint( + $this->walkRangeVariableDeclaration($identificationVariableDecl->rangeVariableDeclaration), + $this->query->getHint(Query::HINT_LOCK_MODE) + ); foreach ($identificationVariableDecl->joins as $join) { $sql .= $this->walkJoin($join); @@ -770,7 +773,7 @@ class SqlWalker implements TreeWalker } } - $sqlParts[] = $this->platform->appendLockHint($sql, $this->query->getHint(Query::HINT_LOCK_MODE)); + $sqlParts[] = $sql; } return ' FROM ' . implode(', ', $sqlParts); @@ -1367,13 +1370,16 @@ class SqlWalker implements TreeWalker $sqlParts = array (); foreach ($identificationVarDecls as $subselectIdVarDecl) { - $sql = $this->walkRangeVariableDeclaration($subselectIdVarDecl->rangeVariableDeclaration); + $sql = $this->platform->appendLockHint( + $this->walkRangeVariableDeclaration($subselectIdVarDecl->rangeVariableDeclaration), + $this->query->getHint(Query::HINT_LOCK_MODE) + ); foreach ($subselectIdVarDecl->joins as $join) { $sql .= $this->walkJoin($join); } - $sqlParts[] = $this->platform->appendLockHint($sql, $this->query->getHint(Query::HINT_LOCK_MODE)); + $sqlParts[] = $sql; } return ' FROM ' . implode(', ', $sqlParts); diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php index 098934e302..43e8f22396 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php @@ -74,6 +74,10 @@ class CountOutputWalker extends SqlWalker */ public function walkSelectStatement(SelectStatement $AST) { + if ($this->platform->getName() === "mssql") { + $AST->orderByClause = null; + } + $sql = parent::walkSelectStatement($AST); // Find out the SQL alias of the identifier column of the root entity diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php b/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php index 05b8e3b0ab..1d56af300a 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php @@ -1376,6 +1376,10 @@ class UnitOfWork implements PropertyChangedListener return self::STATE_NEW; } + if ($class->containsForeignIdentifier) { + $id = $this->flattenIdentifier($class, $id); + } + switch (true) { case ($class->isIdentifierNatural()); // Check for a version field, if available, to avoid a db lookup. @@ -1688,6 +1692,29 @@ class UnitOfWork implements PropertyChangedListener return $this->doMerge($entity, $visited); } + /** + * convert foreign identifiers into scalar foreign key values to avoid object to string conversion failures. + * + * @param ClassMetadata $class + * @param array $id + * @return array + */ + private function flattenIdentifier($class, $id) + { + $flatId = array(); + + foreach ($id as $idField => $idValue) { + if (isset($class->associationMappings[$idField])) { + $targetClassMetadata = $this->em->getClassMetadata($class->associationMappings[$idField]['targetEntity']); + $associatedId = $this->getEntityIdentifier($idValue); + + $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]]; + } + } + + return $flatId; + } + /** * Executes a merge operation on an entity. * @@ -1735,19 +1762,9 @@ class UnitOfWork implements PropertyChangedListener $this->persistNew($class, $managedCopy); } else { - $flatId = $id; - if ($class->containsForeignIdentifier) { - // convert foreign identifiers into scalar foreign key - // values to avoid object to string conversion failures. - foreach ($id as $idField => $idValue) { - if (isset($class->associationMappings[$idField])) { - $targetClassMetadata = $this->em->getClassMetadata($class->associationMappings[$idField]['targetEntity']); - $associatedId = $this->getEntityIdentifier($idValue); - - $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]]; - } - } - } + $flatId = ($class->containsForeignIdentifier) + ? $this->flattenIdentifier($class, $id) + : $id; $managedCopy = $this->tryGetById($flatId, $class->rootEntityName); @@ -2415,17 +2432,23 @@ class UnitOfWork implements PropertyChangedListener if ($entity instanceof NotifyPropertyChanged) { $entity->addPropertyChangedListener($this); } + + // inject ObjectManager into just loaded proxies. + if ($overrideLocalValues && $entity instanceof ObjectManagerAware) { + $entity->injectObjectManager($this->em, $class); + } + } else { $overrideLocalValues = isset($hints[Query::HINT_REFRESH]); // If only a specific entity is set to refresh, check that it's the one if(isset($hints[Query::HINT_REFRESH_ENTITY])) { $overrideLocalValues = $hints[Query::HINT_REFRESH_ENTITY] === $entity; + } - // inject ObjectManager into just loaded proxies. - if ($overrideLocalValues && $entity instanceof ObjectManagerAware) { - $entity->injectObjectManager($this->em, $class); - } + // inject ObjectManager upon refresh. + if ($overrideLocalValues && $entity instanceof ObjectManagerAware) { + $entity->injectObjectManager($this->em, $class); } } diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Version.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Version.php index 3484195e1d..9f32726dfa 100644 --- a/vendor/doctrine/orm/lib/Doctrine/ORM/Version.php +++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.3.2'; + const VERSION = '2.3.3'; /** * Compares a Doctrine version with the current one. diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index 75d9d2abe6..f513395d7b 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -173,14 +173,36 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results); $this->assertEquals(2, count($results)); } - + + /** + * @group DDC-2340 + */ + public function testMatchingOnDirtyCollection() + { + $this->_createFixture(); + + $product = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId()); + + $thirdFeature = new ECommerceFeature(); + $thirdFeature->setDescription('Model writing tutorial'); + + $features = $product->getFeatures(); + $features->add($thirdFeature); + + $results = $features->matching(new Criteria( + Criteria::expr()->eq('description', 'Model writing tutorial') + )); + + $this->assertEquals(2, count($results)); + } + public function testMatchingBis() { $this->_createFixture(); $product = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId()); $features = $product->getFeatures(); - + $thirdFeature = new ECommerceFeature(); $thirdFeature->setDescription('Third feature'); $product->addFeature($thirdFeature); diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php index 6ae4595dce..bf2ef0b274 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php @@ -461,4 +461,22 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($before + 3, count($data)); } + + /** + * @group DDC-2246 + */ + public function testGetEntityState() + { + $this->article1 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id()); + $this->article2 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article2->id()); + + $this->reference = new DDC117Reference($this->article2, $this->article1, "Test-Description"); + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($this->reference)); + + $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference)); + } } diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php index 80f90e7ff4..400b5829f7 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php @@ -34,4 +34,28 @@ class SimpleObjectHydratorTest extends HydrationTestCase $hydrator = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em); $hydrator->hydrateAll($stmt, $rsm); } + + public function testExtraFieldInResultSetShouldBeIgnore() + { + $rsm = new ResultSetMapping; + $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); + $rsm->addFieldResult('a', 'a__id', 'id'); + $rsm->addFieldResult('a', 'a__city', 'city'); + $resultSet = array( + array( + 'a__id' => '1', + 'a__city' => 'Cracow', + 'doctrine_rownum' => '1' + ), + ); + + $expectedEntity = new \Doctrine\Tests\Models\CMS\CmsAddress(); + $expectedEntity->id = 1; + $expectedEntity->city = 'Cracow'; + + $stmt = new HydratorMockStatement($resultSet); + $hydrator = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em); + $result = $hydrator->hydrateAll($stmt, $rsm); + $this->assertEquals($result[0], $expectedEntity); + } } diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index b994d4863d..7300a3ad40 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -156,6 +156,8 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase { $this->assertTrue($class->isVersioned); $this->assertEquals("version", $class->versionField); + + $this->assertFalse(isset($class->fieldMappings['version']['version'])); } /** @@ -475,24 +477,22 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase /** * @group DDC-889 - * @expectedException Doctrine\ORM\Mapping\MappingException - * @expectedExceptionMessage Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class. */ public function testInvalidEntityOrMappedSuperClassShouldMentionParentClasses() { + $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.'); + $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class'); } /** * @group DDC-889 - * @expectedException Doctrine\ORM\Mapping\MappingException - * @expectedExceptionMessage No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key. */ public function testIdentifierRequiredShouldMentionParentClasses() { - $factory = $this->createClassMetadataFactory(); - + + $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key.'); $factory->getMetadataFor('Doctrine\Tests\Models\DDC889\DDC889Entity'); } @@ -509,7 +509,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase */ public function testNamedNativeQuery() { - + $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); //named native query @@ -538,7 +538,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase $this->assertArrayHasKey('mapping-count', $class->sqlResultSetMappings); $this->assertArrayHasKey('mapping-find-all', $class->sqlResultSetMappings); $this->assertArrayHasKey('mapping-without-fields', $class->sqlResultSetMappings); - + $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all'); $this->assertEquals('mapping-find-all', $findAllMapping['name']); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $findAllMapping['entities'][0]['entityClass']); @@ -550,7 +550,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $withoutFieldsMapping['entities'][0]['entityClass']); $this->assertEquals(array(), $withoutFieldsMapping['entities'][0]['fields']); - + $countMapping = $class->getSqlResultSetMapping('mapping-count'); $this->assertEquals('mapping-count', $countMapping['name']); $this->assertEquals(array('name'=>'count'), $countMapping['columns'][0]); @@ -638,7 +638,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase $adminMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Admin'); $guestMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Guest'); - + // assert groups association mappings $this->assertArrayHasKey('groups', $guestMetadata->associationMappings); $this->assertArrayHasKey('groups', $adminMetadata->associationMappings); @@ -697,7 +697,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals($guestAddress['isCascadeRefresh'], $adminAddress['isCascadeRefresh']); $this->assertEquals($guestAddress['isCascadeMerge'], $adminAddress['isCascadeMerge']); $this->assertEquals($guestAddress['isCascadeDetach'], $adminAddress['isCascadeDetach']); - + // assert override $this->assertEquals('address_id', $guestAddress['joinColumns'][0]['name']); $this->assertEquals(array('address_id'=>'id'), $guestAddress['sourceToTargetKeyColumns']); @@ -1071,7 +1071,7 @@ class DDC807Entity * @GeneratedValue(strategy="NONE") **/ public $id; - + public static function loadMetadata(ClassMetadataInfo $metadata) { $metadata->mapField(array( diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.dcm.yml b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.dcm.yml index 3437a9b378..674328cd52 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.dcm.yml +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.dcm.yml @@ -5,4 +5,4 @@ Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType: generator: strategy: NONE fields: - name: \ No newline at end of file + name: ~ diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.DDC2069Entity.dcm.yml b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.DDC2069Entity.dcm.yml index 88ab2da207..5b16c12bc9 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.DDC2069Entity.dcm.yml +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.DDC2069Entity.dcm.yml @@ -1,7 +1,7 @@ Doctrine\Tests\ORM\Mapping\DDC2069Entity: type: entity id: - id: + id: ~ fields: name: type: string ( 255 ) @@ -12,4 +12,4 @@ Doctrine\Tests\ORM\Mapping\DDC2069Entity: columns: name, value indexes: 0: - columns: value, name \ No newline at end of file + columns: value, name diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Query/ExprTest.php b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Query/ExprTest.php index 122b98f037..f35b5d4073 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Query/ExprTest.php +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Query/ExprTest.php @@ -409,4 +409,18 @@ class ExprTest extends \Doctrine\Tests\OrmTestCase $select = new Expr\Select(array('foo', 'bar')); $this->assertEquals(array('foo', 'bar'), $select->getParts()); } + + public function testAddEmpty() { + $andExpr = $this->_expr->andx(); + $andExpr->add($this->_expr->andx()); + + $this->assertEquals(0, $andExpr->count()); + } + + public function testAddNull() { + $andExpr = $this->_expr->andx(); + $andExpr->add(null); + + $this->assertEquals(0, $andExpr->count()); + } } diff --git a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php index 688f101b0f..f3c2e1b50a 100644 --- a/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php +++ b/vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php @@ -41,5 +41,22 @@ class CountOutputWalkerTest extends PaginationTestCase "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id1 FROM (SELECT count(u0_.id) AS sclr0, g1_.id AS id1, u0_.id AS id2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr0 > 0) dctrn_result) dctrn_table", $query->getSql() ); } + + public function testCountQueryOrderBySqlServer() + { + if ($this->entityManager->getConnection()->getDatabasePlatform()->getName() !== "mssql") { + $this->markTestSkipped('SQLServer only test.'); + } + + $query = $this->entityManager->createQuery( + 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p ORDER BY p.id'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker'); + $query->setFirstResult(null)->setMaxResults(null); + + $this->assertEquals( + "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id0 FROM (SELECT b0_.id AS id0, b0_.author_id AS author_id1, b0_.category_id AS category_id2 FROM BlogPost b0_) dctrn_result) dctrn_table", + $query->getSql() + ); + } }