');
- $form->addElement('checkbox', 'repeat', null, get_lang('RepeatEvent'));
-
- $repeat_events = array(
- 'daily' => get_lang('RepeatDaily'),
- 'weekly' => get_lang('RepeatWeekly'),
- 'monthlyByDate' => get_lang('RepeatMonthlyByDate'),
- 'yearly' => get_lang('RepeatYearly')
- );
+ if ($this->type == 'course') {
+ $repeat = $form->addElement('checkbox', 'repeat', null, get_lang('RepeatEvent'), array('onclick' => 'return plus_repeated_event();'));
+ $form->addElement('html', '
');
+ $form->addElement('select', 'repeat_type', get_lang('RepeatType'), self::getRepeatTypes());
+ $form->addElement('date_picker', 'repeat_end_day', get_lang('RepeatEnd'), array('id' => 'repeat_end_date_form'));
- $form->addElement('select', 'repeat_type', get_lang('RepeatType'), $repeat_events);
- $form->addElement('text', 'repeat_end_day', get_lang('RepeatEnd'));
+ if ($isSubEventEdition || $isParentFromSerie) {
+ if ($isSubEventEdition) {
+ $parentEvent = $params['parent_info'];
+ $repeatInfo = $parentEvent['repeat_info'];
+ } else {
+ $repeatInfo = $params['repeat_info'];
+ }
+ $params['repeat'] = 1;
+ $params['repeat_type'] = $repeatInfo['cal_type'];
+ $params['repeat_end_day'] = substr(api_get_local_time($repeatInfo['cal_end']), 0, 10);
+
+ $form->freeze(array('repeat_type', 'repeat_end_day'));
+ $repeat->_attributes['disabled'] = 'disabled';
+ }
$form->addElement('html', '
');
+ }
- if (!api_is_allowed_to_edit(null, true)) {
- $toolbar = 'AgendaStudent';
- } else {
- $toolbar = 'Agenda';
+ if (!empty($id)) {
+ if (empty($params['end_date'])) {
+ $params['date_range'] = $params['end_date'];
}
- //$form->addElement('html_editor', 'content', get_lang('Description'), null, array('ToolbarSet' => $toolbar, 'Width' => '100%', 'Height' => '200'));
+
+ $params['date_range'] =
+ substr(api_get_local_time($params['start_date']), 0, 16).' / '.
+ substr(api_get_local_time($params['end_date']), 0, 16);
+ }
+
+ if (!api_is_allowed_to_edit(null, true)) {
+ $toolbar = 'AgendaStudent';
+ } else {
+ $toolbar = 'Agenda';
+ }
+
+ $form->addElement(
+ 'html_editor',
+ 'content',
+ get_lang('Description'),
+ null,
+ array('ToolbarSet' => $toolbar, 'Width' => '100%', 'Height' => '200')
+ );
+
+ if ($this->type == 'course') {
$form->addElement('file', 'user_upload', get_lang('AddAnAttachment'));
- $form->addElement('text', 'file_comment', get_lang('Comment'));
+ if ($showAttachmentForm) {
+ if (isset($params['attachment']) && !empty($params['attachment'])) {
+ $attachment = $params['attachment'];
+ $params['file_comment'] = $attachment['comment'];
+ if (!empty($attachment['path'])) {
+ $form->addElement(
+ 'checkbox',
+ 'delete_attachment',
+ null,
+ get_lang('DeleteAttachment').' '.$attachment['filename']
+ );
+ }
+ }
+ }
+
+ $form->addElement('textarea', 'file_comment', get_lang('Comment'));
+ }
+
+ if (empty($id)) {
+ $form->addElement(
+ 'checkbox',
+ 'add_announcement',
+ null,
+ get_lang('AddAnnouncement').' ('.get_lang('SendMail').')'
+ );
}
$form->addElement('button', 'submit', $button);
- $form->display();
+ $form->setDefaults($params);
+
+ $form->addRule('date_range', get_lang('ThisFieldIsRequired'), 'required');
+ $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
+
+ return $form;
}
/**
- * @param array $form
- * @param $to_already_selected
+ * @param FormValidator $form
+ * @param array $sendTo array('everyone' => false, 'users' => [1, 2], 'groups' => [3, 4])
+ * @param array $attributes
+ * @param bool $addOnlyItemsInSendTo
+ * @return bool
*/
- public static function show_to_form($form, $to_already_selected)
- {
+ public function showToForm(
+ $form,
+ $sendTo = array(),
+ $attributes = array(),
+ $addOnlyItemsInSendTo = false
+ ) {
+ if ($this->type != 'course') {
+ return false;
+ }
+
$order = 'lastname';
if (api_is_western_name_order()) {
$order = 'firstname';
}
- $user_list = CourseManager::get_user_list_from_course_code(
+
+ $userList = CourseManager::get_user_list_from_course_code(
api_get_course_id(),
api_get_session_id(),
null,
$order
);
- $group_list = CourseManager::get_group_list_of_course(api_get_course_id(), api_get_session_id());
+ $groupList = CourseManager::get_group_list_of_course(
+ api_get_course_id(),
+ api_get_session_id()
+ );
- self::construct_not_selected_select_form_validator($form, $group_list, $user_list, $to_already_selected);
- }
+ $this->setSendToSelect(
+ $form,
+ $groupList,
+ $userList,
+ $sendTo,
+ $attributes,
+ $addOnlyItemsInSendTo
+ );
+ return true;
+ }
/**
- * Adds a repetitive item to the database
- * @param array Course info
- * @param int The original event's id
- * @param string Type of repetition
- * @param int Timestamp of end of repetition (repeating until that date)
- * @param array $userList
- * @param string a comment about a attachment file into agenda
- * @return boolean False if error, True otherwise
+ * @param int $id
+ * @param int $visibility 0= invisible, 1 visible
+ * @param array $courseInfo
+ * @param int $userId
*/
- private function addRepeatItem($course_info, $orig_id, $type, $end, $userList, $file_comment = '')
+ public static function changeVisibility($id, $visibility, $courseInfo, $userId = null)
{
- $t_agenda = Database::get_course_table(TABLE_AGENDA);
- $t_agenda_r = Database::get_course_table(TABLE_AGENDA_REPEAT);
-
- $course_id = $course_info['real_id'];
-
- $sql = 'SELECT title, content, start_date as sd, end_date as ed FROM '.$t_agenda.'
- WHERE c_id = '.$course_id.' AND id ="'.intval($orig_id).'" ';
- $res = Database::query($sql);
- if (Database::num_rows($res) !== 1) {
- return false;
+ $id = Database::escape_string($id);
+ if (empty($userId)) {
+ $userId = api_get_user_id();
+ } else {
+ $userId = intval($userId);
}
- $row = Database::fetch_array($res);
- $orig_start = api_strtotime(api_get_local_time($row['sd']));
- $orig_end = api_strtotime(api_get_local_time($row['ed']));
-
- $diff = $orig_end - $orig_start;
- $orig_title = $row['title'];
- $orig_content = $row['content'];
- $now = time();
- $type = Database::escape_string($type);
- $end = intval($end);
- if (1 <= $end && $end <= 500) {
- //we assume that, with this type of value, the user actually gives a count of repetitions
- //and that he wants us to calculate the end date with that (particularly in case of imports from ical)
- switch ($type) {
- case 'daily':
- $end = $orig_start + (86400 * $end);
- break;
- case 'weekly':
- $end = $this->addWeek($orig_start, $end);
- break;
- case 'monthlyByDate':
- $end = $this->addMonth($orig_start, $end);
- break;
- case 'monthlyByDay':
- //TODO
- break;
- case 'monthlyByDayR':
- //TODO
- break;
- case 'yearly':
- $end = $this->addYear($orig_start, $end);
- break;
- }
+ if ($visibility == 0) {
+ api_item_property_update($courseInfo, TOOL_CALENDAR_EVENT, $id, "invisible", $userId);
+ } else {
+ api_item_property_update($courseInfo, TOOL_CALENDAR_EVENT, $id, "visible", $userId);
}
+ }
- if ($end > $now
- && in_array($type, array('daily', 'weekly', 'monthlyByDate', 'monthlyByDay', 'monthlyByDayR', 'yearly'))) {
- $sql = "INSERT INTO $t_agenda_r (c_id, cal_id, cal_type, cal_end)
- VALUES ($course_id, '$orig_id', '$type', $end)";
- Database::query($sql);
- switch ($type) {
- case 'daily':
- for ($i = $orig_start + 86400; ($i <= $end); $i += 86400) {
- $this->add_event(date('Y-m-d H:i:s', $i), date('Y-m-d H:i:s', $i + $diff), false, null, $orig_title, $orig_content, $userList, false, $orig_id);
- }
- break;
- case 'weekly':
- for ($i = $orig_start + 604800; ($i <= $end); $i += 604800) {
- $this->add_event(date('Y-m-d H:i:s', $i), date('Y-m-d H:i:s', $i + $diff), false, null, $orig_title, $orig_content, $userList, false, $orig_id);
- //$res = agenda_add_item($course_info, $orig_title, $orig_content, date('Y-m-d H:i:s', $i), date('Y-m-d H:i:s', $i + $diff), $userList, $orig_id, $file_comment);
- }
- break;
- case 'monthlyByDate':
- $next_start = $this->addMonth($orig_start);
- while ($next_start <= $end) {
- $this->add_event(date('Y-m-d H:i:s', $next_start), date('Y-m-d H:i:s', $next_start + $diff), false, null, $orig_title, $orig_content, $userList, false, $orig_id);
- //$res = agenda_add_item($course_info, $orig_title, $orig_content, date('Y-m-d H:i:s', $next_start), date('Y-m-d H:i:s', $next_start + $diff), $userList, $orig_id, $file_comment);
- $next_start = $this->addMonth($next_start);
- }
- break;
- case 'monthlyByDay':
- //not yet implemented
- break;
- case 'monthlyByDayR':
- //not yet implemented
- break;
- case 'yearly':
- $next_start = $this->addYear($orig_start);
- while ($next_start <= $end) {
- $this->add_event(date('Y-m-d H:i:s', $next_start), date('Y-m-d H:i:s', $next_start + $diff), false, null, $orig_title, $orig_content, $userList, false, $orig_id);
- //agenda_add_item($course_info, $orig_title, $orig_content, date('Y-m-d H:i:s', $next_start), date('Y-m-d H:i:s', $next_start + $diff), $userList, $orig_id, $file_comment);
- $next_start = $this->addYear($next_start);
- }
- break;
- }
- }
- return true;
+ /**
+ * Get repeat types
+ * @return array
+ */
+ public static function getRepeatTypes()
+ {
+ return array(
+ 'daily' => get_lang('RepeatDaily'),
+ 'weekly' => get_lang('RepeatWeekly'),
+ 'monthlyByDate' => get_lang('RepeatMonthlyByDate'),
+ //monthlyByDay"> get_lang('RepeatMonthlyByDay');
+ //monthlyByDayR' => get_lang('RepeatMonthlyByDayR'),
+ 'yearly' => get_lang('RepeatYearly')
+ );
}
/**
+ * Show a list with all the attachments according to the post's id
* @param int $eventId
- * @param array $settings = array('comment' => $comment, 'file' => $file
- * @return bool
+ * @param array $courseInfo
+ * @return array with the post info
*/
- private function addAttachment($eventId, $settings)
+ public function getAttachment($eventId, $courseInfo)
{
- $table = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
-
- if (!isset($settings['file'])) {
- return false;
+ $tableAttachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
+ $courseId = intval($courseInfo['real_id']);
+ $eventId = Database::escape_string($eventId);
+ $row = array();
+ $sql = "SELECT id, path, filename, comment
+ FROM $tableAttachment
+ WHERE
+ c_id = $courseId AND
+ agenda_id = $eventId";
+ $result = Database::query($sql);
+ if (Database::num_rows($result) != 0) {
+ $row = Database::fetch_array($result, 'ASSOC');
}
- $file = $settings['file'];
-
- if (!empty($file['name'])) {
- $upload_ok = FileManager::process_uploaded_file($file);
- }
+ return $row;
+ }
- $_course = api_get_course_info();
+ /**
+ * Add an attachment file into agenda
+ * @param int $eventId
+ * @param array $fileUserUpload ($_FILES['user_upload'])
+ * @param string comment about file
+ * @param array $courseInfo
+ * @return string
+ */
+ public function addAttachment($eventId, $fileUserUpload, $comment, $courseInfo)
+ {
+ $agenda_table_attachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
+ $eventId = intval($eventId);
+ // Storing the attachments
+ $upload_ok = false;
+ if (!empty($fileUserUpload['name'])) {
+ $upload_ok = process_uploaded_file($fileUserUpload);
+ }
if (!empty($upload_ok)) {
- $courseDir = $_course['path'].'/upload/calendar';
+
+ $courseDir = $courseInfo['directory'].'/upload/calendar';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
- $updir = $sys_course_path.$courseDir;
+ $uploadDir = $sys_course_path.$courseDir;
// Try to add an extension to the file if it hasn't one
- $new_file_name = FileManager::add_ext_on_mime(
- stripslashes($_FILES['user_upload']['name']),
- $_FILES['user_upload']['type']
+ $new_file_name = add_ext_on_mime(
+ stripslashes($fileUserUpload['name']),
+ $fileUserUpload['type']
);
// user's file name
- $file_name = $_FILES['user_upload']['name'];
+ $file_name = $fileUserUpload['name'];
- if (!FileManager::filter_extension($new_file_name)) {
- Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+ if (!filter_extension($new_file_name)) {
+ return Display::return_message(
+ get_lang('UplUnableToSaveFileFilteredExtension'),
+ 'error'
+ );
} else {
$new_file_name = uniqid('');
- $new_path = $updir.'/'.$new_file_name;
- $result = move_uploaded_file($file['tmp_name'], $new_path);
- $safe_file_comment = Database::escape_string($settings['comment']);
- $safe_file_name = Database::escape_string($file_name);
- $safe_new_file_name = Database::escape_string($new_file_name);
+ $new_path = $uploadDir.'/'.$new_file_name;
+ $result = @move_uploaded_file($fileUserUpload['tmp_name'], $new_path);
+ $comment = Database::escape_string($comment);
+ $file_name = Database::escape_string($file_name);
$course_id = api_get_course_int_id();
+ $size = intval($fileUserUpload['size']);
// Storing the attachments if any
if ($result) {
- $sql = 'INSERT INTO '.$table.'(c_id, filename,comment, path,agenda_id,size) '.
- "VALUES ($course_id, '".$safe_file_name."', '".$safe_file_comment."', '".$safe_new_file_name."' , '".$eventId."', '".intval($file['size'])."' )";
+ $sql = 'INSERT INTO '.$agenda_table_attachment.'(c_id, filename, comment, path, agenda_id, size) '.
+ "VALUES ($course_id, '".$file_name."', '".$comment."', '".$new_file_name."' , '".$eventId."', '".$size."' )";
Database::query($sql);
- $last_id_file = Database::insert_id();
- api_item_property_update($_course, 'calendar_event_attachment', $last_id_file, 'AgendaAttachmentAdded', api_get_user_id());
+ $id = Database::insert_id();
+ api_item_property_update(
+ $courseInfo,
+ 'calendar_event_attachment',
+ $id,
+ 'AgendaAttachmentAdded',
+ api_get_user_id()
+ );
}
}
}
}
/**
- * @param $timestamp
- * @param int $num
- * @return int
+ * @param int $eventId
+ * @param array $fileUserUpload
+ * @param string $comment
+ * @param array $courseInfo
+ */
+ public function updateAttachment($eventId, $fileUserUpload, $comment, $courseInfo)
+ {
+ $attachment = $this->getAttachment($eventId, $courseInfo);
+ if (!empty($attachment)) {
+ $this->deleteAttachmentFile($attachment['id'], $courseInfo);
+ }
+ $this->addAttachment($eventId, $fileUserUpload, $comment, $courseInfo);
+ }
+
+ /**
+ * This function delete a attachment file by id
+ * @param int $attachmentId
+ * @param array $courseInfo
+ * @return string
*/
- private function addMonth($timestamp, $num = 1)
+ public function deleteAttachmentFile($attachmentId, $courseInfo)
{
- list($y, $m, $d, $h, $n, $s) = explode('/', date('Y/m/d/h/i/s', $timestamp));
+ $agenda_table_attachment = Database::get_course_table(TABLE_AGENDA_ATTACHMENT);
+ $attachmentId = intval($attachmentId);
+ $courseId = $courseInfo['real_id'];
+
+ if (empty($courseId) || empty($attachmentId)) {
+ return false;
+ }
+
+ $sql = "DELETE FROM $agenda_table_attachment
+ WHERE c_id = $courseId AND id = ".$attachmentId;
+ $result = Database::query($sql);
+
+ // update item_property
+ api_item_property_update(
+ $courseInfo,
+ 'calendar_event_attachment',
+ $attachmentId,
+ 'AgendaAttachmentDeleted',
+ api_get_user_id()
+ );
+
+ if (!empty($result)) {
+ return Display::return_message(get_lang("AttachmentFileDeleteSuccess"), 'confirmation');
+ }
+ }
+
+ /**
+ * Adds x weeks to a UNIX timestamp
+ * @param int The timestamp
+ * @param int The number of weeks to add
+ * @return int The new timestamp
+ */
+ function addWeek($timestamp, $num = 1)
+ {
+ return $timestamp + $num * 604800;
+ }
+
+ /**
+ * Adds x months to a UNIX timestamp
+ * @param int The timestamp
+ * @param int The number of years to add
+ * @return int The new timestamp
+ */
+ function addMonth($timestamp, $num = 1)
+ {
+ list($y, $m, $d, $h, $n, $s) = split('/', date('Y/m/d/h/i/s', $timestamp));
if ($m + $num > 12) {
$y += floor($num / 12);
$m += $num % 12;
@@ -1298,25 +2021,268 @@ class Agenda
}
/**
- * @param $timestamp
- * @param int $num
- * @return int
+ * Adds x years to a UNIX timestamp
+ * @param int The timestamp
+ * @param int The number of years to add
+ * @return int The new timestamp
*/
- private function addYear($timestamp, $num = 1)
+ function addYear($timestamp, $num = 1)
{
- list($y, $m, $d, $h, $n, $s) = explode('/', date('Y/m/d/h/i/s', $timestamp));
+ list($y, $m, $d, $h, $n, $s) = split('/', date('Y/m/d/h/i/s', $timestamp));
return mktime($h, $n, $s, $m, $d, $y + $num);
}
/**
- * Adds x weeks to a UNIX timestamp
- * @param int The timestamp
- * @param int The number of weeks to add
- * @return int The new timestamp
+ * @param int $eventId
+ * @return array
*/
- private function addWeek($timestamp, $num = 1)
+ public function getAllRepeatEvents($eventId)
{
- return $timestamp + $num * 604800;
+ $events = array();
+ switch ($this->type) {
+ case 'personal':
+ break;
+ case 'course':
+ if (!empty($this->course['real_id'])) {
+ $sql = "SELECT * FROM ".$this->tbl_course_agenda."
+ WHERE
+ c_id = ".$this->course['real_id']." AND
+ parent_event_id = ".$eventId;
+ $result = Database::query($sql);
+ if (Database::num_rows($result)) {
+ while ($row = Database::fetch_array($result, 'ASSOC')) {
+ $events[] = $row;
+ }
+ }
+ }
+ break;
+ }
+
+ return $events;
+ }
+
+ /**
+ * @param int $eventId
+ * @param int $courseId
+ *
+ * @return bool
+ */
+ public function hasChildren($eventId, $courseId)
+ {
+ $eventId = intval($eventId);
+ $courseId = intval($courseId);
+
+ $sql = "SELECT count(DISTINCT(id)) as count
+ FROM ".$this->tbl_course_agenda."
+ WHERE
+ c_id = ".$courseId." AND
+ parent_event_id = ".$eventId;
+ $result = Database::query($sql);
+ if (Database::num_rows($result)) {
+ $row = Database::fetch_array($result, 'ASSOC');
+ return $row['count'] > 0;
+ }
+ return false;
+ }
+
+ /**
+ * @param int $filter
+ * @param string $view
+ * @return string
+ */
+ public function displayActions($view, $filter = 0)
+ {
+ $actions = "
".
+ Display::return_icon('calendar.png', get_lang('Calendar'), '', ICON_SIZE_MEDIUM)."";
+
+ $actions .= "
".
+ Display::return_icon('week.png', get_lang('AgendaList'), '', ICON_SIZE_MEDIUM)."";
+
+ if (api_is_allowed_to_edit(false, true) OR
+ (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()) && api_is_allowed_to_session_edit(false, true) OR
+ GroupManager::user_has_access(api_get_user_id(), api_get_group_id(), GroupManager::GROUP_TOOL_CALENDAR) &&
+ GroupManager::is_tutor_of_group(api_get_user_id(), api_get_group_id())
+ ) {
+ if ($this->type == 'course') {
+ $form = null;
+ if (!isset($_GET['action'])) {
+ $form = new FormValidator('form-search');
+ $attributes = array(
+ 'multiple' => false,
+ 'id' => 'select_form_id_search'
+ );
+ $selectedValues = $this->parseAgendaFilter($filter);
+ $this->showToForm($form, $selectedValues, $attributes);
+ $form = $form->return_form();
+
+ }
+ $actions .= "
".
+ Display::return_icon('new_event.png', get_lang('AgendaAdd'), '', ICON_SIZE_MEDIUM)."";
+ $actions .= "
".
+ Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM)."";
+ if ($view == 'calendar') {
+ $actions .= $form;
+ }
+ }
+ }
+ return $actions;
+ }
+
+ /**
+ * @return FormValidator
+ */
+ public function getImportCalendarForm()
+ {
+ $form = new FormValidator(
+ 'frm_import_ical',
+ 'post',
+ api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&type='.$this->type,
+ array('enctype' => 'multipart/form-data')
+ );
+ $form->addElement('header', get_lang('ICalFileImport'));
+ $form->addElement('file', 'ical_import', get_lang('ICalFileImport'));
+ $form->addRule('ical_import', get_lang('ThisFieldIsRequired'), 'required');
+ $form->addElement('button', 'ical_submit', get_lang('Import'));
+
+ return $form;
}
+ /**
+ * @param array $courseInfo
+ * @param $file
+ * @return array|bool|string
+ */
+ public function importEventFile($courseInfo, $file)
+ {
+ $charset = api_get_system_encoding();
+ $filepath = api_get_path(SYS_ARCHIVE_PATH).$file['name'];
+ $messages = array();
+
+ if (!@move_uploaded_file($file['tmp_name'], $filepath)) {
+ error_log('Problem moving uploaded file: '.$file['error'].' in '.__FILE__.' line '.__LINE__);
+ return false;
+ }
+
+ $data = file_get_contents($filepath);
+
+ require_once api_get_path(SYS_PATH).'vendor/autoload.php';
+
+ $trans = array(
+ 'DAILY' => 'daily',
+ 'WEEKLY' => 'weekly',
+ 'MONTHLY' => 'monthlyByDate',
+ 'YEARLY' => 'yearly'
+ );
+ $sentTo = array('everyone' => true);
+ $calendar = Sabre\VObject\Reader::read($data);
+ $currentTimeZone = _api_get_timezone();
+ if (!empty($calendar->VEVENT)) {
+ foreach ($calendar->VEVENT as $event) {
+ $start = $event->DTSTART->getDateTime();
+ $end = $event->DTEND->getDateTime();
+ //Sabre\VObject\DateTimeParser::parseDateTime(string $dt, \Sabre\VObject\DateTimeZone $tz)
+
+ $startDateTime = api_get_local_time($start->format('Y-m-d H:i:s'), $currentTimeZone, $start->format('e'));
+ $endDateTime = api_get_local_time($end->format('Y-m-d H:i'), $currentTimeZone, $end->format('e'));
+ $title = api_convert_encoding((string)$event->summary, $charset, 'UTF-8');
+ $description = api_convert_encoding((string)$event->description, $charset, 'UTF-8');
+
+ $id = $this->add_event(
+ $startDateTime,
+ $endDateTime,
+ 'false',
+ $title,
+ $description,
+ $sentTo
+ );
+
+ $messages[] = " $title - ".$startDateTime." - ".$endDateTime;
+
+ //$attendee = (string)$event->attendee;
+ /** @var Sabre\VObject\Property\ICalendar\Recur $repeat */
+ $repeat = $event->RRULE;
+ if ($id && !empty($repeat)) {
+
+ $repeat = $repeat->getParts();
+ $freq = $trans[$repeat['FREQ']];
+
+ if (isset($repeat['UNTIL']) && !empty($repeat['UNTIL'])) {
+ $until = Sabre\VObject\DateTimeParser::parseDateTime($repeat['UNTIL'], new DateTimeZone($currentTimeZone));
+ $until = $until->format('Y-m-d H:i');
+ //$res = agenda_add_repeat_item($courseInfo, $id, $freq, $until, $attendee);
+ $this->addRepeatedItem(
+ $id,
+ $freq,
+ $until,
+ $sentTo
+ );
+ }
+
+ if (!empty($repeat['COUNT'])) {
+ /*$count = $repeat['COUNT'];
+ $interval = $repeat['INTERVAL'];
+ $endDate = null;
+ switch($freq) {
+ case 'daily':
+ $start = api_strtotime($startDateTime);
+ $date = new DateTime($startDateTime);
+ $days = $count * $interval;
+ var_dump($days);
+ $date->add(new DateInterval("P".$days."D"));
+ $endDate = $date->format('Y-m-d H:i');
+ //$endDate = $count *
+ for ($i = 0; $i < $count; $i++) {
+ $days = 86400 * 7
+ }
+ }
+ }*/
+ //$res = agenda_add_repeat_item($courseInfo, $id, $freq, $count, $attendee);
+ /*$this->addRepeatedItem(
+ $id,
+ $freq,
+ $endDate,
+ $sentTo
+ );*/
+ }
+ }
+ }
+ }
+
+ if (!empty($messages)) {
+ $messages = implode('
', $messages);
+ }
+
+ return $messages;
+ }
+
+ /**
+ * Parse filter turns USER:12 to ['users' => [12])] or G:1 ['groups' => [1]]
+ * @param $filter
+ * @return array
+ */
+ public function parseAgendaFilter($filter)
+ {
+ $everyone = false;
+ $groupId = null;
+ $userId = null;
+
+ if ($filter == 'everyone') {
+ $everyone = true;
+ } else {
+ if (substr($filter, 0, 1) == 'G') {
+ $groupId = str_replace('GROUP:', '', $filter);
+ } else {
+ $userId = str_replace('USER:', '', $filter);
+ }
+ }
+ if (empty($userId) && empty($groupId)) {
+ $everyone = true;
+ }
+
+ return array(
+ 'everyone' => $everyone,
+ 'users' => array($userId),
+ 'groups' => array($groupId)
+ );
+ }
}
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index adca5c26d9..865cda6714 100644
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -430,7 +430,12 @@ class CourseHome
$col_link ="##003399";
break;
case TOOL_AUTHORING:
- $sql = "SELECT * FROM $course_tool_table WHERE category = 'authoring' AND c_id = $course_id $condition_session ORDER BY id";
+ $sql = "SELECT * FROM $course_tool_table
+ WHERE
+ category = 'authoring' AND
+ c_id = $course_id
+ $condition_session
+ ORDER BY id";
$result = Database::query($sql);
$col_link ="##003399";
diff --git a/main/inc/lib/pear/HTML/QuickForm/select.php b/main/inc/lib/pear/HTML/QuickForm/select.php
index cad163ced3..2a14432dc1 100644
--- a/main/inc/lib/pear/HTML/QuickForm/select.php
+++ b/main/inc/lib/pear/HTML/QuickForm/select.php
@@ -26,7 +26,6 @@
/**
* Base class for form elements
*/
-//require_once 'HTML/QuickForm/element.php';
/**
* Class to dynamically create an HTML SELECT
@@ -116,7 +115,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
function setSelected($values)
{
if (is_string($values) && $this->getMultiple()) {
- $values = @split("[ ]?,[ ]?", $values);
+ $values = split("[ ]?,[ ]?", $values);
}
if (is_array($values)) {
$this->_values = array_values($values);
@@ -326,7 +325,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
} // end func addOption
- /**
+ /**
* Adds a new OPTION to the SELECT
*
* @param string $text Display text for the OPTION
@@ -339,14 +338,11 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
*/
function addOptGroup($options, $label)
{
- foreach ($options as &$option) {
- $option[] = $this->addOption($option['text'], $option['value'], null, true);
+ foreach ($options as $option) {
+ $this->addOption($option['text'], $option['value'], $option, true);
}
$this->_optgroups[] = array('label' => $label, 'options' => $options);
- } // end func addOption
-
- // }}}
- // {{{ loadArray()
+ }
/**
* Loads the options from an associative array
@@ -428,7 +424,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
function loadQuery(&$conn, $sql, $textCol=null, $valueCol=null, $values=null)
{
if (is_string($conn)) {
- //require_once('DB.php');
+ require_once('DB.php');
$dbConn = &DB::connect($conn, true);
if (DB::isError($dbConn)) {
return $dbConn;
@@ -520,11 +516,8 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
$attrString = $this->_getAttrString($this->_attributes);
$this->setName($myName);
}
- $strHtml .= $tabs . '
\n";
- if (isset($this->_attributes['data-placeholder'])) {
- $strHtml .= "";
- }
+ $strHtml .= $tabs . '\n";
$strValues = is_array($this->_values)? array_map('strval', $this->_values): array();
foreach ($this->_options as $option) {
@@ -532,25 +525,21 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
$option['attr']['selected'] = 'selected';
}
$strHtml .= $tabs . "\t_getAttrString($option['attr']) . '>' .
- $option['text'] . "\n";
+ $option['text'] . "\n";
}
-
foreach ($this->_optgroups as $optgroup) {
- $strHtml .= $tabs . "\t";
}
return $strHtml . $tabs . '';
}
- } //end func toHtml
+ }
- // }}}
- // {{{ getFrozenHtml()
/**
* Returns the value of field without HTML tags
@@ -584,10 +573,10 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
}
foreach ($value as $key => $item) {
$html .= '_getAttrString(array(
- 'type' => 'hidden',
- 'name' => $name,
- 'value' => $this->_values[$key]
- ) + $idAttr) . ' />';
+ 'type' => 'hidden',
+ 'name' => $name,
+ 'value' => $this->_values[$key]
+ ) + $idAttr) . ' />';
}
}
return $html;
@@ -596,10 +585,10 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
// }}}
// {{{ exportValue()
- /**
- * We check the options and return only the values that _could_ have been
- * selected. We also return a scalar value if select is not "multiple"
- */
+ /**
+ * We check the options and return only the values that _could_ have been
+ * selected. We also return a scalar value if select is not "multiple"
+ */
function exportValue(&$submitValues, $assoc = false)
{
$value = $this->_findValue($submitValues);
diff --git a/src/ChamiloLMS/CoreBundle/DependencyInjection/Compiler/DoctrineEntityListenerPass.php b/src/ChamiloLMS/CoreBundle/DependencyInjection/Compiler/DoctrineEntityListenerPass.php
new file mode 100644
index 0000000000..06e3ced8d6
--- /dev/null
+++ b/src/ChamiloLMS/CoreBundle/DependencyInjection/Compiler/DoctrineEntityListenerPass.php
@@ -0,0 +1,22 @@
+getDefinition('chamilolms.doctrine.entity_listener_resolver');
+ $services = $container->findTaggedServiceIds('doctrine.entity_listener');
+
+ foreach ($services as $service => $attributes) {
+ $definition->addMethodCall(
+ 'addMapping',
+ array($container->getDefinition($service)->getClass(), $service)
+ );
+ }
+ }
+}
diff --git a/src/ChamiloLMS/CoreBundle/Doctrine/EntityListenerResolver.php b/src/ChamiloLMS/CoreBundle/Doctrine/EntityListenerResolver.php
new file mode 100644
index 0000000000..1a1c2b45a7
--- /dev/null
+++ b/src/ChamiloLMS/CoreBundle/Doctrine/EntityListenerResolver.php
@@ -0,0 +1,40 @@
+container = $container;
+ $this->mapping = array();
+ }
+
+ /**
+ * @param $className
+ * @param $service
+ */
+ public function addMapping($className, $service)
+ {
+ $this->mapping[$className] = $service;
+ }
+
+ public function resolve($className)
+ {
+ if (isset($this->mapping[$className]) && $this->container->has($this->mapping[$className])) {
+ return $this->container->get($this->mapping[$className]);
+ }
+
+ return parent::resolve($className);
+
+ }
+}
diff --git a/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php b/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php
new file mode 100644
index 0000000000..1b0c9a7a93
--- /dev/null
+++ b/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php
@@ -0,0 +1,60 @@
+container = $container;
+ }
+
+ public function onSetupMenu(SidebarMenuKnpEvent $event)
+ {
+ $request = $event->getRequest();
+
+ foreach ($this->getMenu($request) as $item) {
+ $event->addItem($item);
+ }
+ }
+
+ protected function getMenu(Request $request)
+ {
+ $menu = $this->container->get('chamilolms.menu.simple_menu');
+
+ /** @var \Knp\Menu\ItemInterface $menuItems */
+ $menuItems = $menu->mainMenu(
+ $this->container->get('knp_menu.factory'),
+ array()
+ );
+
+ return $this->activateByRoute($request->get('_route'), $menuItems);
+ }
+
+ protected function activateByRoute($route, $items)
+ {
+ /** @var \Knp\Menu\MenuItem $item */
+ foreach ($items as $item) {
+ if ($item->hasChildren()) {
+ $this->activateByRoute($route, $item->getChildren());
+ } else {
+ if ($item->isCurrent()) {
+ $item->setCurrent(true);
+ }
+ /*if ($item->getRoute() == $route) {
+ $item->setIsActive(true);
+ }*/
+ }
+ }
+
+ return $items;
+ }
+}
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 779f683296..0ba9e0e46c 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitafc49d8078f44ed99fdf94305db6ff51::getLoader();
+return ComposerAutoloaderInita4aa94c829bfe1922707cba4e98c7e3f::getLoader();
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 9d472cb5dd..fa1a99c444 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -86,7 +86,7 @@ return array(
'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'),
'Doctrine\\Bundle\\MigrationsBundle' => array($vendorDir . '/doctrine/doctrine-migrations-bundle'),
'Doctrine\\Bundle\\FixturesBundle' => array($vendorDir . '/doctrine/doctrine-fixtures-bundle'),
- 'Doctrine\\Bundle\\DoctrineBundle' => array($vendorDir . '/doctrine/doctrine-bundle'),
+ 'Doctrine\\Bundle\\DoctrineCacheBundle' => array($vendorDir . '/doctrine/doctrine-cache-bundle'),
'Composer' => array($vendorDir . '/composer/composer/src'),
'Chash' => array($vendorDir . '/chamilo/chash/src'),
'CG\\' => array($vendorDir . '/jms/cg/src'),
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 1ad7f39c72..bec5063a22 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -51,4 +51,5 @@ return array(
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
'Google\\Authenticator\\Tests\\' => array($vendorDir . '/sonata-project/google-authenticator/tests'),
'Google\\Authenticator\\' => array($vendorDir . '/sonata-project/google-authenticator/lib'),
+ 'Doctrine\\Bundle\\DoctrineBundle\\' => array($vendorDir . '/doctrine/doctrine-bundle'),
);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 08dd14c4a8..4530203eeb 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitafc49d8078f44ed99fdf94305db6ff51
+class ComposerAutoloaderInita4aa94c829bfe1922707cba4e98c7e3f
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitafc49d8078f44ed99fdf94305db6ff51
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitafc49d8078f44ed99fdf94305db6ff51', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInita4aa94c829bfe1922707cba4e98c7e3f', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitafc49d8078f44ed99fdf94305db6ff51', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInita4aa94c829bfe1922707cba4e98c7e3f', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@ class ComposerAutoloaderInitafc49d8078f44ed99fdf94305db6ff51
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequireafc49d8078f44ed99fdf94305db6ff51($file);
+ composerRequirea4aa94c829bfe1922707cba4e98c7e3f($file);
}
return $loader;
}
}
-function composerRequireafc49d8078f44ed99fdf94305db6ff51($file)
+function composerRequirea4aa94c829bfe1922707cba4e98c7e3f($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index e030b437f3..3af3903d65 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -769,80 +769,6 @@
"queryobject"
]
},
- {
- "name": "doctrine/doctrine-bundle",
- "version": "v1.2.0",
- "version_normalized": "1.2.0.0",
- "target-dir": "Doctrine/Bundle/DoctrineBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9",
- "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9",
- "shasum": ""
- },
- "require": {
- "doctrine/dbal": ">=2.2,<2.5-dev",
- "jdorn/sql-formatter": "~1.1",
- "php": ">=5.3.2",
- "symfony/doctrine-bridge": "~2.2",
- "symfony/framework-bundle": "~2.2"
- },
- "require-dev": {
- "doctrine/orm": ">=2.2,<2.5-dev",
- "symfony/validator": "~2.2",
- "symfony/yaml": "~2.2"
- },
- "suggest": {
- "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
- "symfony/web-profiler-bundle": "to use the data collector"
- },
- "time": "2013-03-25 20:13:59",
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Bundle\\DoctrineBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- }
- ],
- "description": "Symfony DoctrineBundle",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "database",
- "dbal",
- "orm",
- "persistence"
- ]
- },
{
"name": "doctrine/doctrine-fixtures-bundle",
"version": "v2.2.0",
@@ -2747,12 +2673,12 @@
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "ac497feabaa0d247c441178b7b4aaa4c61b07399"
+ "reference": "28c65b5425f7f8722c260e3787b74c1ea6b37e3b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/ac497feabaa0d247c441178b7b4aaa4c61b07399",
- "reference": "ac497feabaa0d247c441178b7b4aaa4c61b07399",
+ "url": "https://api.github.com/repos/composer/composer/zipball/28c65b5425f7f8722c260e3787b74c1ea6b37e3b",
+ "reference": "28c65b5425f7f8722c260e3787b74c1ea6b37e3b",
"shasum": ""
},
"require": {
@@ -2770,7 +2696,7 @@
"ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
"ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
},
- "time": "2014-06-10 14:13:12",
+ "time": "2014-06-22 18:24:28",
"bin": [
"bin/composer"
],
@@ -3178,58 +3104,6 @@
"distribution"
]
},
- {
- "name": "sensio/generator-bundle",
- "version": "v2.3.4",
- "version_normalized": "2.3.4.0",
- "target-dir": "Sensio/Bundle/GeneratorBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "4a7b126e9c22f858e3584b19ddce6e5bdd7677ee"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4a7b126e9c22f858e3584b19ddce6e5bdd7677ee",
- "reference": "4a7b126e9c22f858e3584b19ddce6e5bdd7677ee",
- "shasum": ""
- },
- "require": {
- "symfony/console": "~2.0",
- "symfony/framework-bundle": "~2.2"
- },
- "require-dev": {
- "doctrine/orm": "~2.2,>=2.2.3",
- "symfony/doctrine-bridge": "~2.2",
- "twig/twig": "~1.11"
- },
- "time": "2013-08-21 18:09:35",
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Sensio\\Bundle\\GeneratorBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- }
- ],
- "description": "This bundle generates code for you"
- },
{
"name": "symfony-cmf/routing",
"version": "1.2.0",
@@ -3546,59 +3420,6 @@
"xls"
]
},
- {
- "name": "egeloen/json-builder",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
- "target-dir": "Ivory/JsonBuilder",
- "source": {
- "type": "git",
- "url": "https://github.com/egeloen/ivory-json-builder.git",
- "reference": "873454440f6a84867fb2908d86254b0dabf8644b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/egeloen/ivory-json-builder/zipball/873454440f6a84867fb2908d86254b0dabf8644b",
- "reference": "873454440f6a84867fb2908d86254b0dabf8644b",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "symfony/property-access": "2.*"
- },
- "require-dev": {
- "phpunit/phpunit": "3.7.*"
- },
- "time": "2014-02-02 13:54:43",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Ivory\\JsonBuilder": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Eric GELOEN",
- "email": "geloen.eric@gmail.com"
- }
- ],
- "description": "JSON builder with escaping control for PHP 5.3+",
- "keywords": [
- "Escape",
- "builder",
- "json"
- ]
- },
{
"name": "kriswallsmith/buzz",
"version": "v0.10",
@@ -4093,12 +3914,12 @@
"source": {
"type": "git",
"url": "https://github.com/sonata-project/cache.git",
- "reference": "d975c3f64f36054d37c1c5e1585fb6b1d34f872c"
+ "reference": "a560c97b12c40947ad07dbc984d5a2c8cc2889e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sonata-project/cache/zipball/d975c3f64f36054d37c1c5e1585fb6b1d34f872c",
- "reference": "d975c3f64f36054d37c1c5e1585fb6b1d34f872c",
+ "url": "https://api.github.com/repos/sonata-project/cache/zipball/a560c97b12c40947ad07dbc984d5a2c8cc2889e7",
+ "reference": "a560c97b12c40947ad07dbc984d5a2c8cc2889e7",
"shasum": ""
},
"require-dev": {
@@ -4115,7 +3936,7 @@
"ext-memcached": "Caching with ext/memcached",
"predis/predis": "Install redis php"
},
- "time": "2014-06-10 13:04:43",
+ "time": "2014-06-23 12:50:50",
"type": "library",
"extra": {
"branch-alias": {
@@ -4402,12 +4223,12 @@
"source": {
"type": "git",
"url": "https://github.com/sonata-project/SonataAdminBundle.git",
- "reference": "f3e49a32cdb354667b0693f1d893e96d80c69526"
+ "reference": "83d22c0483e0979d6962a45e9f183ff44e54daaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/f3e49a32cdb354667b0693f1d893e96d80c69526",
- "reference": "f3e49a32cdb354667b0693f1d893e96d80c69526",
+ "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/83d22c0483e0979d6962a45e9f183ff44e54daaf",
+ "reference": "83d22c0483e0979d6962a45e9f183ff44e54daaf",
"shasum": ""
},
"require": {
@@ -4439,7 +4260,7 @@
"jms/translation-bundle": "Extract message keys from Admins",
"sonata-project/intl-bundle": "Add localized date and number into the list"
},
- "time": "2014-06-12 09:47:42",
+ "time": "2014-06-24 13:55:57",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -4752,12 +4573,12 @@
"source": {
"type": "git",
"url": "https://github.com/sonata-project/SonataMediaBundle.git",
- "reference": "769a12fb8e3335e2e179480bbd6e3818336272fb"
+ "reference": "56fbf226e0ced9947a3e6665a1fc1c4199585b6e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sonata-project/SonataMediaBundle/zipball/769a12fb8e3335e2e179480bbd6e3818336272fb",
- "reference": "769a12fb8e3335e2e179480bbd6e3818336272fb",
+ "url": "https://api.github.com/repos/sonata-project/SonataMediaBundle/zipball/56fbf226e0ced9947a3e6665a1fc1c4199585b6e",
+ "reference": "56fbf226e0ced9947a3e6665a1fc1c4199585b6e",
"shasum": ""
},
"require": {
@@ -4791,7 +4612,7 @@
"sonata-project/seo-bundle": "~1.1",
"tilleuls/ckeditor-sonata-mediabundle": "~1.0"
},
- "time": "2014-06-10 20:53:19",
+ "time": "2014-06-18 14:43:40",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -4904,12 +4725,12 @@
"source": {
"type": "git",
"url": "https://github.com/sonata-project/SonataUserBundle.git",
- "reference": "cf51088baea7f9d11d7e1a91f6eb4357717da93a"
+ "reference": "49769e79b4fcbeb1cb9b9f8582c8092c90d6e08d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sonata-project/SonataUserBundle/zipball/cf51088baea7f9d11d7e1a91f6eb4357717da93a",
- "reference": "cf51088baea7f9d11d7e1a91f6eb4357717da93a",
+ "url": "https://api.github.com/repos/sonata-project/SonataUserBundle/zipball/49769e79b4fcbeb1cb9b9f8582c8092c90d6e08d",
+ "reference": "49769e79b4fcbeb1cb9b9f8582c8092c90d6e08d",
"shasum": ""
},
"require": {
@@ -4935,7 +4756,7 @@
"sonata-project/doctrine-orm-admin-bundle": "~2.3@dev",
"sonata-project/seo-bundle": "~1.1"
},
- "time": "2014-06-04 09:55:48",
+ "time": "2014-06-18 09:56:30",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -4978,12 +4799,12 @@
"source": {
"type": "git",
"url": "https://github.com/sonata-project/SonataCacheBundle.git",
- "reference": "5dd85ef0b94be804ae7ca029f5ee72a3ca3a7c21"
+ "reference": "edce4fc365c003a294aff739da22bd8cd2d17296"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sonata-project/SonataCacheBundle/zipball/5dd85ef0b94be804ae7ca029f5ee72a3ca3a7c21",
- "reference": "5dd85ef0b94be804ae7ca029f5ee72a3ca3a7c21",
+ "url": "https://api.github.com/repos/sonata-project/SonataCacheBundle/zipball/edce4fc365c003a294aff739da22bd8cd2d17296",
+ "reference": "edce4fc365c003a294aff739da22bd8cd2d17296",
"shasum": ""
},
"require": {
@@ -5008,7 +4829,7 @@
"ext-memcached": "Caching with ext/memcached",
"predis/predis": "Install redis php"
},
- "time": "2014-06-14 12:43:58",
+ "time": "2014-06-19 10:52:42",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -5102,12 +4923,12 @@
"source": {
"type": "git",
"url": "https://github.com/sonata-project/SonataFormatterBundle.git",
- "reference": "e736dd28d0e084483080f73ab4d105f216331c34"
+ "reference": "4b741d76c8e1941c624dcc7f56455b59b32028cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sonata-project/SonataFormatterBundle/zipball/e736dd28d0e084483080f73ab4d105f216331c34",
- "reference": "e736dd28d0e084483080f73ab4d105f216331c34",
+ "url": "https://api.github.com/repos/sonata-project/SonataFormatterBundle/zipball/4b741d76c8e1941c624dcc7f56455b59b32028cc",
+ "reference": "4b741d76c8e1941c624dcc7f56455b59b32028cc",
"shasum": ""
},
"require": {
@@ -5119,7 +4940,7 @@
"symfony/symfony": "~2.3",
"twig/twig": "*"
},
- "time": "2014-06-02 10:28:04",
+ "time": "2014-06-18 12:35:21",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -5291,65 +5112,6 @@
"paging"
]
},
- {
- "name": "egeloen/ckeditor-bundle",
- "version": "2.3.1",
- "version_normalized": "2.3.1.0",
- "target-dir": "Ivory/CKEditorBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/egeloen/IvoryCKEditorBundle.git",
- "reference": "42d201a59fa0e1625f4dd7167a57a2337b9a528f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/egeloen/IvoryCKEditorBundle/zipball/42d201a59fa0e1625f4dd7167a57a2337b9a528f",
- "reference": "42d201a59fa0e1625f4dd7167a57a2337b9a528f",
- "shasum": ""
- },
- "require": {
- "egeloen/json-builder": "~1.0",
- "php": ">=5.3.0",
- "symfony/form": "~2.1",
- "symfony/framework-bundle": "~2.1"
- },
- "require-dev": {
- "phpunit/phpunit": "~3.7",
- "satooshi/php-coveralls": "~0.6",
- "twig/twig": "~1.0"
- },
- "suggest": {
- "helios-ag/fm-elfinder-bundle": "Allows to use the elfinder as CKEditor file manager",
- "twig/twig": "Allows to use Ivory CKEditor twig templates"
- },
- "time": "2014-05-26 19:37:11",
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Ivory\\CKEditorBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Eric GELOEN",
- "email": "geloen.eric@gmail.com"
- }
- ],
- "description": "Provides a CKEditor integration for your Symfony2 Project.",
- "keywords": [
- "CKEditor"
- ]
- },
{
"name": "hwi/oauth-bundle",
"version": "dev-master",
@@ -5721,32 +5483,35 @@
]
},
{
- "name": "lexik/maintenance-bundle",
+ "name": "avanzu/admin-theme-bundle",
"version": "dev-master",
"version_normalized": "9999999-dev",
- "target-dir": "Lexik/Bundle/MaintenanceBundle",
+ "target-dir": "Avanzu/AdminThemeBundle",
"source": {
"type": "git",
- "url": "https://github.com/lexik/LexikMaintenanceBundle.git",
- "reference": "287f8e00140930d60efc9b2be3c9a1e94dfacd81"
+ "url": "https://github.com/avanzu/AdminThemeBundle.git",
+ "reference": "1efbc558adb91b4fb8cfaa5ac8c55c1ad1b3998a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lexik/LexikMaintenanceBundle/zipball/287f8e00140930d60efc9b2be3c9a1e94dfacd81",
- "reference": "287f8e00140930d60efc9b2be3c9a1e94dfacd81",
+ "url": "https://api.github.com/repos/avanzu/AdminThemeBundle/zipball/1efbc558adb91b4fb8cfaa5ac8c55c1ad1b3998a",
+ "reference": "1efbc558adb91b4fb8cfaa5ac8c55c1ad1b3998a",
"shasum": ""
},
"require": {
- "php": ">=5.3.2",
- "symfony/dependency-injection": "~2.1",
- "symfony/framework-bundle": "~2.1"
+ "php": ">=5.3.0",
+ "symfony/assetic-bundle": ">=2.3",
+ "symfony/event-dispatcher": ">=2.3",
+ "symfony/http-foundation": ">=2.3",
+ "symfony/http-kernel": ">=2.3",
+ "symfony/twig-bundle": ">=2.3"
},
- "time": "2014-04-30 07:50:35",
- "type": "symfony-bundle",
+ "time": "2014-05-30 13:35:04",
+ "type": "library",
"installation-source": "source",
"autoload": {
"psr-0": {
- "Lexik\\Bundle\\MaintenanceBundle": ""
+ "Avanzu\\AdminThemeBundle": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -5755,68 +5520,10 @@
],
"authors": [
{
- "name": "Dev Lexik",
- "email": "dev@lexik.fr"
- },
- {
- "name": "Gilles Gauthier",
- "email": "g.gauthier@lexik.fr"
- },
- {
- "name": "Djuri Baars",
- "email": "info@djurict.nl"
- }
- ],
- "description": "This bundle allows you to place your website in maintenance mode by calling two commands from your console.",
- "homepage": "https://github.com/lexik/LexikMaintenanceBundle",
- "keywords": [
- "Symfony2",
- "bundle",
- "maintenance"
- ]
- },
- {
- "name": "avanzu/admin-theme-bundle",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "target-dir": "Avanzu/AdminThemeBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/avanzu/AdminThemeBundle.git",
- "reference": "1efbc558adb91b4fb8cfaa5ac8c55c1ad1b3998a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/avanzu/AdminThemeBundle/zipball/1efbc558adb91b4fb8cfaa5ac8c55c1ad1b3998a",
- "reference": "1efbc558adb91b4fb8cfaa5ac8c55c1ad1b3998a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "symfony/assetic-bundle": ">=2.3",
- "symfony/event-dispatcher": ">=2.3",
- "symfony/http-foundation": ">=2.3",
- "symfony/http-kernel": ">=2.3",
- "symfony/twig-bundle": ">=2.3"
- },
- "time": "2014-05-30 13:35:04",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "psr-0": {
- "Avanzu\\AdminThemeBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marc Bach",
- "email": "mail@avanzu.de",
- "homepage": "http://www.avanzu.de",
- "role": "Developer"
+ "name": "Marc Bach",
+ "email": "mail@avanzu.de",
+ "homepage": "http://www.avanzu.de",
+ "role": "Developer"
}
],
"description": "Admin Theme based on the AdminLTE Template for easy integration into symfony"
@@ -6235,57 +5942,6 @@
"stylesheet"
]
},
- {
- "name": "sensio/framework-extra-bundle",
- "version": "v2.3.4",
- "version_normalized": "2.3.4.0",
- "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "cce05719041d952bbec856789ca18646a1891d03"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/cce05719041d952bbec856789ca18646a1891d03",
- "reference": "cce05719041d952bbec856789ca18646a1891d03",
- "shasum": ""
- },
- "require": {
- "doctrine/common": "~2.2",
- "symfony/framework-bundle": "~2.2"
- },
- "time": "2013-07-24 08:49:53",
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Sensio\\Bundle\\FrameworkExtraBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- }
- ],
- "description": "This bundle provides a way to configure your controllers with annotations",
- "keywords": [
- "annotations",
- "controllers"
- ]
- },
{
"name": "sylius/flow-bundle",
"version": "dev-master",
@@ -6293,12 +5949,12 @@
"source": {
"type": "git",
"url": "https://github.com/Sylius/SyliusFlowBundle.git",
- "reference": "7dbbf33dda366822cbfe9d0d03f5a20215481eff"
+ "reference": "f62d38cba80a6e74672412aea4bb4193c2edcf71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Sylius/SyliusFlowBundle/zipball/7dbbf33dda366822cbfe9d0d03f5a20215481eff",
- "reference": "7dbbf33dda366822cbfe9d0d03f5a20215481eff",
+ "url": "https://api.github.com/repos/Sylius/SyliusFlowBundle/zipball/f62d38cba80a6e74672412aea4bb4193c2edcf71",
+ "reference": "f62d38cba80a6e74672412aea4bb4193c2edcf71",
"shasum": ""
},
"require": {
@@ -6308,7 +5964,7 @@
"require-dev": {
"symfony/yaml": "~2.1"
},
- "time": "2014-05-23 22:05:51",
+ "time": "2014-06-24 01:41:19",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -6721,84 +6377,6 @@
"zip"
]
},
- {
- "name": "doctrine/orm",
- "version": "v2.4.3",
- "version_normalized": "2.4.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/doctrine2.git",
- "reference": "8a13376d42b5ea467727ffe730aa0e14ca3c5e29"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/8a13376d42b5ea467727ffe730aa0e14ca3c5e29",
- "reference": "8a13376d42b5ea467727ffe730aa0e14ca3c5e29",
- "shasum": ""
- },
- "require": {
- "doctrine/collections": "~1.1",
- "doctrine/dbal": "~2.4",
- "ext-pdo": "*",
- "php": ">=5.3.2",
- "symfony/console": "~2.0"
- },
- "require-dev": {
- "satooshi/php-coveralls": "dev-master",
- "symfony/yaml": "~2.1"
- },
- "suggest": {
- "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
- },
- "time": "2014-06-10 11:49:08",
- "bin": [
- "bin/doctrine",
- "bin/doctrine.php"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.4.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\ORM\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- }
- ],
- "description": "Object-Relational-Mapper for PHP",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "database",
- "orm"
- ]
- },
{
"name": "sonata-project/page-bundle",
"version": "dev-master",
@@ -6870,54 +6448,6 @@
"sonata"
]
},
- {
- "name": "chamilo/chash",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/chamilo/chash.git",
- "reference": "3a1d82ea6f6c120ec9be50621bfe4a730f1cbf42"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/chamilo/chash/zipball/3a1d82ea6f6c120ec9be50621bfe4a730f1cbf42",
- "reference": "3a1d82ea6f6c120ec9be50621bfe4a730f1cbf42",
- "shasum": ""
- },
- "require": {
- "alchemy/zippy": "~0.1",
- "composer/composer": "1.0.*@dev",
- "doctrine/dbal": "~2.3",
- "doctrine/migrations": "dev-master",
- "doctrine/orm": "~2.3",
- "php": ">=5.3.2",
- "symfony/console": "~2.3",
- "symfony/filesystem": "~2.3",
- "symfony/finder": "~2.3",
- "symfony/yaml": "~2.3",
- "zendframework/zend-config": "~2.2",
- "zendframework/zend-stdlib": "~2.2"
- },
- "require-dev": {
- "mikey179/vfsstream": ">=1.2",
- "phpunit/phpunit": "3.7.*"
- },
- "time": "2014-06-10 14:57:33",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "psr-0": {
- "Chash": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-3.0"
- ],
- "description": "Chamilo Shell",
- "homepage": "http://www.chamilo.org"
- },
{
"name": "symfony/symfony",
"version": "v2.5.0",
@@ -7163,42 +6693,49 @@
]
},
{
- "name": "imagine/imagine",
- "version": "v0.6.0",
- "version_normalized": "0.6.0.0",
+ "name": "doctrine/orm",
+ "version": "v2.4.2",
+ "version_normalized": "2.4.2.0",
"source": {
"type": "git",
- "url": "https://github.com/avalanche123/Imagine.git",
- "reference": "ff1550c270fe6116cfed778607024125e754899a"
+ "url": "https://github.com/doctrine/doctrine2.git",
+ "reference": "0363a5548d9263f979f9ca149decb9cfc66419ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/ff1550c270fe6116cfed778607024125e754899a",
- "reference": "ff1550c270fe6116cfed778607024125e754899a",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/0363a5548d9263f979f9ca149decb9cfc66419ab",
+ "reference": "0363a5548d9263f979f9ca149decb9cfc66419ab",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "doctrine/collections": "~1.1",
+ "doctrine/dbal": "~2.4",
+ "ext-pdo": "*",
+ "php": ">=5.3.2",
+ "symfony/console": "~2.0"
},
"require-dev": {
- "sami/sami": "dev-master"
+ "satooshi/php-coveralls": "dev-master",
+ "symfony/yaml": "~2.1"
},
"suggest": {
- "ext-gd": "to use the GD implementation",
- "ext-gmagick": "to use the Gmagick implementation",
- "ext-imagick": "to use the Imagick implementation"
+ "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
- "time": "2014-06-13 10:56:49",
+ "time": "2014-02-08 16:35:09",
+ "bin": [
+ "bin/doctrine",
+ "bin/doctrine.php"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.6-dev"
+ "dev-master": "2.4.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Imagine": "lib/"
+ "Doctrine\\ORM\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -7207,18 +6744,585 @@
],
"authors": [
{
- "name": "Bulat Shakirzyanov",
- "email": "mallluhuct@gmail.com",
- "homepage": "http://avalanche123.com"
- }
- ],
- "description": "Image processing for PHP 5.3",
- "homepage": "http://imagine.readthedocs.org/",
- "keywords": [
- "drawing",
- "graphics",
- "image manipulation",
- "image processing"
- ]
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com",
+ "homepage": "http://www.jwage.com/",
+ "role": "Creator"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com",
+ "homepage": "http://www.instaclick.com"
+ },
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ }
+ ],
+ "description": "Object-Relational-Mapper for PHP",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "database",
+ "orm"
+ ]
+ },
+ {
+ "name": "sensio/framework-extra-bundle",
+ "version": "v3.0.1",
+ "version_normalized": "3.0.1.0",
+ "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
+ "reference": "dbc1e5aa830f3bf8063b29102add3c1e476d616e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/dbc1e5aa830f3bf8063b29102add3c1e476d616e",
+ "reference": "dbc1e5aa830f3bf8063b29102add3c1e476d616e",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/common": "~2.2",
+ "symfony/framework-bundle": "~2.5"
+ },
+ "require-dev": {
+ "symfony/expression-language": "~2.4",
+ "symfony/security-bundle": "~2.4"
+ },
+ "suggest": {
+ "symfony/expression-language": "",
+ "symfony/security-bundle": ""
+ },
+ "time": "2014-05-22 23:27:44",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Sensio\\Bundle\\FrameworkExtraBundle": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ }
+ ],
+ "description": "This bundle provides a way to configure your controllers with annotations",
+ "keywords": [
+ "annotations",
+ "controllers"
+ ]
+ },
+ {
+ "name": "imagine/imagine",
+ "version": "v0.6.1",
+ "version_normalized": "0.6.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/avalanche123/Imagine.git",
+ "reference": "725279fd560faa1c7012a80b427b31d7f08f36ff"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/725279fd560faa1c7012a80b427b31d7f08f36ff",
+ "reference": "725279fd560faa1c7012a80b427b31d7f08f36ff",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "sami/sami": "dev-master"
+ },
+ "suggest": {
+ "ext-gd": "to use the GD implementation",
+ "ext-gmagick": "to use the Gmagick implementation",
+ "ext-imagick": "to use the Imagick implementation"
+ },
+ "time": "2014-06-16 20:53:48",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-develop": "0.6-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Imagine": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bulat Shakirzyanov",
+ "email": "mallluhuct@gmail.com",
+ "homepage": "http://avalanche123.com"
+ }
+ ],
+ "description": "Image processing for PHP 5.3",
+ "homepage": "http://imagine.readthedocs.org/",
+ "keywords": [
+ "drawing",
+ "graphics",
+ "image manipulation",
+ "image processing"
+ ]
+ },
+ {
+ "name": "doctrine/doctrine-cache-bundle",
+ "version": "1.0.0",
+ "version_normalized": "1.0.0.0",
+ "target-dir": "Doctrine/Bundle/DoctrineCacheBundle",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
+ "reference": "49a9d2d9a35863201e5e608d1194db28946c4552"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/49a9d2d9a35863201e5e608d1194db28946c4552",
+ "reference": "49a9d2d9a35863201e5e608d1194db28946c4552",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/cache": "~1.3",
+ "doctrine/inflector": "~1.0",
+ "php": ">=5.3.2",
+ "symfony/doctrine-bridge": "~2.2",
+ "symfony/framework-bundle": "~2.2",
+ "symfony/security": "~2.2"
+ },
+ "require-dev": {
+ "instaclick/coding-standard": "~1.1",
+ "instaclick/object-calisthenics-sniffs": "dev-master",
+ "instaclick/symfony2-coding-standard": "dev-remaster",
+ "phpunit/phpunit": "~3.7",
+ "satooshi/php-coveralls": "~0.6.1",
+ "squizlabs/php_codesniffer": "dev-master",
+ "symfony/validator": "~2.2",
+ "symfony/yaml": "~2.2"
+ },
+ "time": "2014-03-04 19:18:55",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Doctrine\\Bundle\\DoctrineCacheBundle": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Fabio B. Silva",
+ "email": "fabio.bat.silva@gmail.com"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@hotmail.com"
+ },
+ {
+ "name": "Doctrine Project",
+ "homepage": "http://www.doctrine-project.org/"
+ }
+ ],
+ "description": "Symfony2 Bundle for Doctrine Cache",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "cache",
+ "caching"
+ ]
+ },
+ {
+ "name": "doctrine/doctrine-bundle",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/DoctrineBundle.git",
+ "reference": "e604136b2bfb95cfcade987ec21d69bf65975b71"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e604136b2bfb95cfcade987ec21d69bf65975b71",
+ "reference": "e604136b2bfb95cfcade987ec21d69bf65975b71",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/dbal": "~2.3",
+ "doctrine/doctrine-cache-bundle": "~1.0",
+ "jdorn/sql-formatter": "~1.1",
+ "php": ">=5.3.2",
+ "symfony/doctrine-bridge": "~2.2",
+ "symfony/framework-bundle": "~2.2"
+ },
+ "require-dev": {
+ "doctrine/orm": "~2.3",
+ "phpunit/php-code-coverage": "~1.2",
+ "phpunit/phpunit": "~3.7",
+ "phpunit/phpunit-mock-objects": "~1.2",
+ "satooshi/php-coveralls": "~0.6.1",
+ "symfony/validator": "~2.2",
+ "symfony/yaml": "~2.2",
+ "twig/twig": "~1"
+ },
+ "suggest": {
+ "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
+ "symfony/web-profiler-bundle": "to use the data collector"
+ },
+ "time": "2014-06-21 16:09:36",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ }
+ },
+ "installation-source": "source",
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Bundle\\DoctrineBundle\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Doctrine Project",
+ "homepage": "http://www.doctrine-project.org/"
+ }
+ ],
+ "description": "Symfony DoctrineBundle",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "database",
+ "dbal",
+ "orm",
+ "persistence"
+ ]
+ },
+ {
+ "name": "egeloen/json-builder",
+ "version": "1.0.1",
+ "version_normalized": "1.0.1.0",
+ "target-dir": "Ivory/JsonBuilder",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/egeloen/ivory-json-builder.git",
+ "reference": "e56c5c509baf7cb5cb2823ae6c987bafed67c7a4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/egeloen/ivory-json-builder/zipball/e56c5c509baf7cb5cb2823ae6c987bafed67c7a4",
+ "reference": "e56c5c509baf7cb5cb2823ae6c987bafed67c7a4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "symfony/property-access": "~2.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7",
+ "satooshi/php-coveralls": "~0.6"
+ },
+ "time": "2014-06-17 13:08:16",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Ivory\\JsonBuilder": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Eric GELOEN",
+ "email": "geloen.eric@gmail.com"
+ }
+ ],
+ "description": "JSON builder with escaping control for PHP 5.3+",
+ "keywords": [
+ "Escape",
+ "builder",
+ "json"
+ ]
+ },
+ {
+ "name": "egeloen/ckeditor-bundle",
+ "version": "2.3.2",
+ "version_normalized": "2.3.2.0",
+ "target-dir": "Ivory/CKEditorBundle",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/egeloen/IvoryCKEditorBundle.git",
+ "reference": "5aba72b1b525f9365744898e96cfb15ed3c99a2e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/egeloen/IvoryCKEditorBundle/zipball/5aba72b1b525f9365744898e96cfb15ed3c99a2e",
+ "reference": "5aba72b1b525f9365744898e96cfb15ed3c99a2e",
+ "shasum": ""
+ },
+ "require": {
+ "egeloen/json-builder": "~1.0",
+ "php": ">=5.3.0",
+ "symfony/form": "~2.1",
+ "symfony/framework-bundle": "~2.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7",
+ "satooshi/php-coveralls": "~0.6",
+ "twig/twig": "~1.0"
+ },
+ "suggest": {
+ "helios-ag/fm-elfinder-bundle": "Allows to use the elfinder as CKEditor file manager",
+ "twig/twig": "Allows to use Ivory CKEditor twig templates"
+ },
+ "time": "2014-06-17 13:25:40",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Ivory\\CKEditorBundle": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Eric GELOEN",
+ "email": "geloen.eric@gmail.com"
+ }
+ ],
+ "description": "Provides a CKEditor integration for your Symfony2 Project.",
+ "keywords": [
+ "CKEditor"
+ ]
+ },
+ {
+ "name": "sensio/generator-bundle",
+ "version": "v2.3.5",
+ "version_normalized": "2.3.5.0",
+ "target-dir": "Sensio/Bundle/GeneratorBundle",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
+ "reference": "8b7a33aa3d22388443b6de0b0cf184122e9f60d2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/8b7a33aa3d22388443b6de0b0cf184122e9f60d2",
+ "reference": "8b7a33aa3d22388443b6de0b0cf184122e9f60d2",
+ "shasum": ""
+ },
+ "require": {
+ "symfony/console": "~2.0",
+ "symfony/framework-bundle": "~2.2"
+ },
+ "require-dev": {
+ "doctrine/orm": "~2.2,>=2.2.3",
+ "symfony/doctrine-bridge": "~2.2",
+ "twig/twig": "~1.11"
+ },
+ "time": "2014-04-28 14:01:06",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Sensio\\Bundle\\GeneratorBundle": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ }
+ ],
+ "description": "This bundle generates code for you"
+ },
+ {
+ "name": "lexik/maintenance-bundle",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "target-dir": "Lexik/Bundle/MaintenanceBundle",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/lexik/LexikMaintenanceBundle.git",
+ "reference": "9e271d9e9843cf65fe8a92f1ee0321305ece5c3b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/lexik/LexikMaintenanceBundle/zipball/9e271d9e9843cf65fe8a92f1ee0321305ece5c3b",
+ "reference": "9e271d9e9843cf65fe8a92f1ee0321305ece5c3b",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2",
+ "symfony/dependency-injection": "~2.1",
+ "symfony/framework-bundle": "~2.1"
+ },
+ "time": "2014-06-20 09:08:21",
+ "type": "symfony-bundle",
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "Lexik\\Bundle\\MaintenanceBundle": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Dev Lexik",
+ "email": "dev@lexik.fr"
+ },
+ {
+ "name": "Gilles Gauthier",
+ "email": "g.gauthier@lexik.fr"
+ },
+ {
+ "name": "Djuri Baars",
+ "email": "info@djurict.nl"
+ }
+ ],
+ "description": "This bundle allows you to place your website in maintenance mode by calling two commands from your console.",
+ "homepage": "https://github.com/lexik/LexikMaintenanceBundle",
+ "keywords": [
+ "Symfony2",
+ "bundle",
+ "maintenance"
+ ]
+ },
+ {
+ "name": "chamilo/chash",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/chamilo/chash.git",
+ "reference": "f5b5f39659afa425ecc4aa4f761a8cca2ead6a09"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/chamilo/chash/zipball/f5b5f39659afa425ecc4aa4f761a8cca2ead6a09",
+ "reference": "f5b5f39659afa425ecc4aa4f761a8cca2ead6a09",
+ "shasum": ""
+ },
+ "require": {
+ "alchemy/zippy": "~0.1",
+ "composer/composer": "1.0.*@dev",
+ "doctrine/dbal": "~2.3",
+ "doctrine/migrations": "dev-master",
+ "doctrine/orm": "~2.3",
+ "php": ">=5.3.2",
+ "symfony/console": "~2.3",
+ "symfony/filesystem": "~2.3",
+ "symfony/finder": "~2.3",
+ "symfony/yaml": "~2.3",
+ "zendframework/zend-config": "~2.2",
+ "zendframework/zend-stdlib": "~2.2"
+ },
+ "require-dev": {
+ "mikey179/vfsstream": ">=1.2",
+ "phpunit/phpunit": "3.7.*"
+ },
+ "time": "2014-06-24 12:38:25",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "Chash": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-3.0"
+ ],
+ "description": "Chamilo Shell",
+ "homepage": "http://www.chamilo.org"
}
]
diff --git a/vendor/doctrine/orm/bin/doctrine.php b/vendor/doctrine/orm/bin/doctrine.php
index 4a960764a6..c73556284f 100755
--- a/vendor/doctrine/orm/bin/doctrine.php
+++ b/vendor/doctrine/orm/bin/doctrine.php
@@ -27,6 +27,7 @@ $directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');
$configFile = null;
foreach ($directories as $directory) {
$configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
+
if (file_exists($configFile)) {
break;
}
diff --git a/vendor/doctrine/orm/docs/en/index.rst b/vendor/doctrine/orm/docs/en/index.rst
index 72cac57271..e71ea7a432 100644
--- a/vendor/doctrine/orm/docs/en/index.rst
+++ b/vendor/doctrine/orm/docs/en/index.rst
@@ -14,7 +14,7 @@ Doctrine ORM don't panic. You can get help from different sources:
- There is a :doc:`FAQ ` with answers to frequent questions.
- The `Doctrine Mailing List `_
-- Internet Relay Chat (IRC) in #doctrine on Freenode
+- Internet Relay Chat (IRC) in `#doctrine on Freenode `_
- Report a bug on `JIRA `_.
- On `Twitter `_ with ``#doctrine2``
- On `StackOverflow `_
@@ -120,4 +120,3 @@ Cookbook
:doc:`MySQL Enums `
:doc:`Advanced Field Value Conversion `
-.. include:: toc.rst
diff --git a/vendor/doctrine/orm/docs/en/reference/caching.rst b/vendor/doctrine/orm/docs/en/reference/caching.rst
index d45090cbc0..1e87efaffe 100644
--- a/vendor/doctrine/orm/docs/en/reference/caching.rst
+++ b/vendor/doctrine/orm/docs/en/reference/caching.rst
@@ -106,7 +106,7 @@ Redis
In order to use the Redis cache driver you must have it compiled
and enabled in your php.ini. You can read about what is Redis
`from here `_. Also check
-`A PHP extension for Redis `_ for how you can use
+`here `_ for how you can use
and install Redis PHP extension.
Below is a simple example of how you could use the Redis cache
diff --git a/vendor/doctrine/orm/docs/en/reference/configuration.rst b/vendor/doctrine/orm/docs/en/reference/configuration.rst
index 4af53c4f03..d8e718b5ca 100644
--- a/vendor/doctrine/orm/docs/en/reference/configuration.rst
+++ b/vendor/doctrine/orm/docs/en/reference/configuration.rst
@@ -100,7 +100,7 @@ Doctrine ships with a number of command line tools that are very helpful
during development. You can call this command from the Composer binary
directory:
-.. code-block:: sh
+.. code-block::
$ php vendor/bin/doctrine
diff --git a/vendor/doctrine/orm/docs/en/reference/events.rst b/vendor/doctrine/orm/docs/en/reference/events.rst
index 4f6cfedb71..517f2ec5b3 100644
--- a/vendor/doctrine/orm/docs/en/reference/events.rst
+++ b/vendor/doctrine/orm/docs/en/reference/events.rst
@@ -207,13 +207,10 @@ listeners:
- Lifecycle Callbacks are methods on the entity classes that are
- called when the event is triggered. As of v2.4 they receive some kind
- of ``EventArgs`` instance.
+ called when the event is triggered. They receives some kind of ``EventArgs``.
- Lifecycle Event Listeners and Subscribers are classes with specific callback
- methods that receives some kind of ``EventArgs`` instance.
-
-The EventArgs instance received by the listener gives access to the entity,
-EntityManager and other relevant data.
+ methods that receives some kind of ``EventArgs`` instance which
+ give access to the entity, EntityManager or other relevant data.
.. note::
@@ -227,11 +224,10 @@ EntityManager and other relevant data.
Lifecycle Callbacks
-------------------
-Lifecycle Callbacks are defined on an entity class. They allow you to
-trigger callbacks whenever an instance of that entity class experiences
-a relevant lifecycle event. More than one callback can be defined for each
-lifecycle event. Lifecycle Callbacks are best used for simple operations
-specific to a particular entity class's lifecycle.
+A lifecycle event is a regular event with the additional feature of
+providing a mechanism to register direct callbacks inside the
+corresponding entity classes that are executed when the lifecycle
+event occurs.
.. code-block:: php
@@ -281,9 +277,8 @@ specific to a particular entity class's lifecycle.
}
}
-Note that the methods set as lifecycle callbacks need to be public and,
-when using these annotations, you have to apply the
-``@HasLifecycleCallbacks`` marker annotation on the entity class.
+Note that when using annotations you have to apply the
+@HasLifecycleCallbacks marker annotation on the entity class.
If you want to register lifecycle callbacks from YAML or XML you
can do it with the following.
@@ -300,10 +295,6 @@ can do it with the following.
prePersist: [ doStuffOnPrePersist, doOtherStuffOnPrePersistToo ]
postPersist: [ doStuffOnPostPersist ]
-In YAML the ``key`` of the lifecycleCallbacks entry is the event that you
-are triggering on and the value is the method (or methods) to call. The allowed
-event types are the ones listed in the previous Lifecycle Events section.
-
XML would look something like this:
.. code-block:: xml
@@ -326,14 +317,9 @@ XML would look something like this:
-In XML the ``type`` of the lifecycle-callback entry is the event that you
-are triggering on and the ``method`` is the method to call. The allowed event
-types are the ones listed in the previous Lifecycle Events section.
-
-When using YAML or XML you need to remember to create public methods to match the
-callback names you defined. E.g. in these examples ``doStuffOnPrePersist()``,
-``doOtherStuffOnPrePersist()`` and ``doStuffOnPostPersist()`` methods need to be
-defined on your ``User`` model.
+You just need to make sure a public ``doStuffOnPrePersist()`` and
+``doStuffOnPostPersist()`` method is defined on your ``User``
+model.
.. code-block:: php
@@ -389,10 +375,8 @@ Listening and subscribing to Lifecycle Events
Lifecycle event listeners are much more powerful than the simple
lifecycle callbacks that are defined on the entity classes. They
-sit at a level above the entities and allow you to implement re-usable
-behaviors across different entity classes.
-
-Note that they require much more detailed knowledge about the inner
+allow to implement re-usable behaviors between different entity
+classes, yet require much more detailed knowledge about the inner
workings of the EntityManager and UnitOfWork. Please read the
*Implementing Event Listeners* section carefully if you are trying
to write your own listener.
@@ -492,8 +476,8 @@ data and lost updates/persists/removes.
For the described events that are also lifecycle callback events
the restrictions apply as well, with the additional restriction
-that (prior to version 2.4) you do not have access to the
-EntityManager or UnitOfWork APIs inside these events.
+that you do not have access to the EntityManager or UnitOfWork APIs
+inside these events.
prePersist
~~~~~~~~~~
@@ -517,9 +501,11 @@ The following restrictions apply to ``prePersist``:
- If you are using a PrePersist Identity Generator such as
sequences the ID value will *NOT* be available within any
PrePersist events.
-- Doctrine will not recognize changes made to relations in a prePersist
- event. This includes modifications to
- collections such as additions, removals or replacement.
+- Doctrine will not recognize changes made to relations in a pre
+ persist event called by "reachability" through a cascade persist
+ unless you use the internal ``UnitOfWork`` API. We do not recommend
+ such operations in the persistence by reachability context, so do
+ this at your own risk and possibly supported by unit-tests.
preRemove
~~~~~~~~~
@@ -713,8 +699,7 @@ Restrictions for this event:
recognized by the flush operation anymore.
- Changes to fields of the passed entities are not recognized by
the flush operation anymore, use the computed change-set passed to
- the event to modify primitive field values, e.g. use
- ``$eventArgs->setNewValue($field, $value);`` as in the Alice to Bob example above.
+ the event to modify primitive field values.
- Any calls to ``EntityManager#persist()`` or
``EntityManager#remove()``, even in combination with the UnitOfWork
API are strongly discouraged and don't work as expected outside the
@@ -784,10 +769,9 @@ An ``Entity Listener`` could be any class, by default it should be a class with
- Different from :ref:`reference-events-implementing-listeners` an ``Entity Listener`` is invoked just to the specified entity
- An entity listener method receives two arguments, the entity instance and the lifecycle event.
-- The callback method can be defined by naming convention or specifying a method mapping.
-- When a listener mapping is not given the parser will use the naming convention to look for a matching method,
- e.g. it will look for a public ``preUpdate()`` method if you are listening to the ``preUpdate`` event.
-- When a listener mapping is given the parser will not look for any methods using the naming convention.
+- A callback method could be defined by naming convention or specifying a method mapping.
+- When the listener mapping is not given the parser will lookup for methods that match with the naming convention.
+- When the listener mapping is given the parser won't lookup for any naming convention.
.. code-block:: php
diff --git a/vendor/doctrine/orm/docs/en/reference/faq.rst b/vendor/doctrine/orm/docs/en/reference/faq.rst
index 45fde18d7e..28e3a42c49 100644
--- a/vendor/doctrine/orm/docs/en/reference/faq.rst
+++ b/vendor/doctrine/orm/docs/en/reference/faq.rst
@@ -143,7 +143,7 @@ See the documentation chapter on :doc:`inheritance mapping
the details.
Why does Doctrine not create proxy objects for my inheritance hierarchy?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you set a many-to-one or one-to-one association target-entity to any parent class of
an inheritance hierarchy Doctrine does not know what PHP class the foreign is actually of.
diff --git a/vendor/doctrine/orm/docs/en/toc.rst b/vendor/doctrine/orm/docs/en/toc.rst
index 1a331fa238..73f1f25b93 100644
--- a/vendor/doctrine/orm/docs/en/toc.rst
+++ b/vendor/doctrine/orm/docs/en/toc.rst
@@ -8,14 +8,12 @@ Tutorials
:maxdepth: 1
tutorials/getting-started
- tutorials/getting-started-database
- tutorials/getting-started-models
tutorials/working-with-indexed-associations
tutorials/extra-lazy-associations
tutorials/composite-primary-keys
tutorials/ordered-associations
+ tutorials/in-ten-quick-steps
tutorials/override-field-association-mappings-in-subclasses
- tutorials/pagination.rst
Reference Guide
---------------
@@ -24,9 +22,9 @@ Reference Guide
:maxdepth: 1
:numbered:
+ reference/introduction
reference/architecture
- reference/installation
- reference/configuration.rst
+ reference/configuration
reference/faq
reference/basic-mapping
reference/association-mapping
@@ -53,9 +51,9 @@ Reference Guide
reference/metadata-drivers
reference/best-practices
reference/limitations-and-known-issues
+ tutorials/pagination.rst
reference/filters.rst
reference/namingstrategy.rst
- reference/advanced-configuration.rst
Cookbook
@@ -65,7 +63,6 @@ Cookbook
:maxdepth: 1
cookbook/aggregate-fields
- cookbook/custom-mapping-types
cookbook/decorator-pattern
cookbook/dql-custom-walkers
cookbook/dql-user-defined-functions
@@ -73,7 +70,6 @@ Cookbook
cookbook/implementing-the-notify-changetracking-policy
cookbook/implementing-wakeup-or-clone
cookbook/integrating-with-codeigniter
- cookbook/resolve-target-entity-listener
cookbook/sql-table-prefixes
cookbook/strategy-cookbook-introduction
cookbook/validation-of-entities
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php
index b35012c994..c1c13c1f77 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/HydrationException.php
@@ -88,18 +88,4 @@ class HydrationException extends \Doctrine\ORM\ORMException
$discrColumnName, $entityName, $dqlAlias
));
}
-
- /**
- * @param string $discrValue
- * @param array $discrMap
- *
- * @return HydrationException
- */
- public static function invalidDiscriminatorValue($discrValue, $discrMap)
- {
- return new self(sprintf(
- 'The discriminator value "%s" is invalid. It must be one of "%s".',
- $discrValue, implode('", "', $discrMap)
- ));
- }
}
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
index cc91acdd3d..fafc497c0d 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -266,13 +266,7 @@ class ObjectHydrator extends AbstractHydrator
throw HydrationException::emptyDiscriminatorValue($dqlAlias);
}
- $discrMap = $this->ce[$className]->discriminatorMap;
-
- if ( ! isset($discrMap[$data[$discrColumn]])) {
- throw HydrationException::invalidDiscriminatorValue($data[$discrColumn], array_keys($discrMap));
- }
-
- $className = $discrMap[$data[$discrColumn]];
+ $className = $this->ce[$className]->discriminatorMap[$data[$discrColumn]];
unset($data[$discrColumn]);
}
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 504d82c51b..eb0982c7d6 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php
@@ -98,13 +98,7 @@ class SimpleObjectHydrator extends AbstractHydrator
throw HydrationException::emptyDiscriminatorValue(key($this->_rsm->aliasMap));
}
- $discrMap = $this->class->discriminatorMap;
-
- if ( ! isset($discrMap[$sqlResult[$discrColumnName]])) {
- throw HydrationException::invalidDiscriminatorValue($sqlResult[$discrColumnName], array_keys($discrMap));
- }
-
- $entityName = $discrMap[$sqlResult[$discrColumnName]];
+ $entityName = $this->class->discriminatorMap[$sqlResult[$discrColumnName]];
unset($sqlResult[$discrColumnName]);
}
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 4880055b3e..01d5b77dd5 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -866,11 +866,7 @@ class ClassMetadataInfo implements ClassMetadata
public function newInstance()
{
if ($this->_prototype === null) {
- if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513) {
- $this->_prototype = $this->reflClass->newInstanceWithoutConstructor();
- } else {
- $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
- }
+ $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
}
return clone $this->_prototype;
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
index 75658547e1..696940b168 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
@@ -57,7 +57,6 @@ class DefaultEntityListenerResolver implements EntityListenerResolver
if ( ! is_object($object)) {
throw new \InvalidArgumentException(sprintf('An object was expected, but got "%s".', gettype($object)));
}
-
$this->instances[get_class($object)] = $object;
}
@@ -66,10 +65,11 @@ class DefaultEntityListenerResolver implements EntityListenerResolver
*/
public function resolve($className)
{
+
if (isset($this->instances[$className = trim($className, '\\')])) {
return $this->instances[$className];
}
return $this->instances[$className] = new $className();
}
-}
\ No newline at end of file
+}
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php
index 4fcb20f771..157bbf618b 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -1497,7 +1497,6 @@ class SqlWalker implements TreeWalker
break;
}
- $fieldType = 'string';
switch (true) {
case ($e instanceof AST\PathExpression):
$fieldName = $e->field;
@@ -1518,6 +1517,10 @@ class SqlWalker implements TreeWalker
break;
}
break;
+
+ default:
+ $fieldType = 'string';
+ break;
}
$this->scalarResultAliasMap[$resultAlias] = $columnAlias;
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
index 7e88615aa0..365fcb415c 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
@@ -22,7 +22,7 @@ namespace Doctrine\ORM\Tools\Console;
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Helper\HelperSet;
use Doctrine\ORM\Version;
-use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityManager;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
@@ -35,10 +35,10 @@ class ConsoleRunner
/**
* Create a Symfony Console HelperSet
*
- * @param EntityManagerInterface $entityManager
+ * @param EntityManager $entityManager
* @return HelperSet
*/
- public static function createHelperSet(EntityManagerInterface $entityManager)
+ public static function createHelperSet(EntityManager $entityManager)
{
return new HelperSet(array(
'db' => new ConnectionHelper($entityManager->getConnection()),
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
index 150fc9b40e..1a8fde1841 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
@@ -193,7 +193,7 @@ class XmlExporter extends AbstractExporter
}
if (isset($field['unique']) && $field['unique']) {
- $fieldXml->addAttribute('unique', $field['unique'] ? 'true' : 'false');
+ $fieldXml->addAttribute('unique', $field['unique']);
}
if (isset($field['options'])) {
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
index 6598cf2b10..2ee5f90562 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -100,9 +100,9 @@ class LimitSubqueryOutputWalker extends SqlWalker
$hiddens[$idx] = $expr->hiddenAliasResultVariable;
$expr->hiddenAliasResultVariable = false;
}
-
+
$innerSql = parent::walkSelectStatement($AST);
-
+
// Restore hiddens
foreach ($AST->selectClause->selectExpressions as $idx => $expr) {
$expr->hiddenAliasResultVariable = $hiddens[$idx];
@@ -160,8 +160,11 @@ class LimitSubqueryOutputWalker extends SqlWalker
$sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result',
implode(', ', $sqlIdentifier), $innerSql);
- // http://www.doctrine-project.org/jira/browse/DDC-1958
- $sql = $this->preserveSqlOrdering($AST, $sqlIdentifier, $innerSql, $sql);
+ if ($this->platform instanceof PostgreSqlPlatform ||
+ $this->platform instanceof OraclePlatform) {
+ //http://www.doctrine-project.org/jira/browse/DDC-1958
+ $this->preserveSqlOrdering($AST, $sqlIdentifier, $innerSql, $sql);
+ }
// Apply the limit and offset.
$sql = $this->platform->modifyLimitQuery(
@@ -178,7 +181,7 @@ class LimitSubqueryOutputWalker extends SqlWalker
return $sql;
}
-
+
/**
* Generates new SQL for Postgresql or Oracle if necessary.
*
@@ -189,7 +192,7 @@ class LimitSubqueryOutputWalker extends SqlWalker
*
* @return void
*/
- public function preserveSqlOrdering(SelectStatement $AST, array $sqlIdentifier, $innerSql, $sql)
+ public function preserveSqlOrdering(SelectStatement $AST, array $sqlIdentifier, $innerSql, &$sql)
{
// For every order by, find out the SQL alias by inspecting the ResultSetMapping.
$sqlOrderColumns = array();
@@ -212,6 +215,11 @@ class LimitSubqueryOutputWalker extends SqlWalker
$sqlOrderColumns = array_diff($sqlOrderColumns, $sqlIdentifier);
}
+ // We don't need orderBy in inner query.
+ // However at least on 5.4.6 I'm getting a segmentation fault and thus we don't clear it for now.
+ /*$AST->orderByClause = null;
+ $innerSql = parent::walkSelectStatement($AST);*/
+
if (count($orderBy)) {
$sql = sprintf(
'SELECT DISTINCT %s FROM (%s) dctrn_result ORDER BY %s',
@@ -220,7 +228,5 @@ class LimitSubqueryOutputWalker extends SqlWalker
implode(', ', $orderBy)
);
}
-
- return $sql;
}
}
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php b/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php
index 5ad54e83c3..745b0322ed 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php
@@ -541,15 +541,7 @@ class UnitOfWork implements PropertyChangedListener
foreach ($class->reflFields as $name => $refProp) {
$value = $refProp->getValue($entity);
- if ($class->isCollectionValuedAssociation($name) && $value !== null) {
- if ($value instanceof PersistentCollection) {
- if ($value->getOwner() === $entity) {
- continue;
- }
-
- $value = new ArrayCollection($value->getValues());
- }
-
+ if ($class->isCollectionValuedAssociation($name) && $value !== null && ! ($value instanceof PersistentCollection)) {
// If $value is not a Collection then use an ArrayCollection.
if ( ! $value instanceof Collection) {
$value = new ArrayCollection($value);
@@ -902,35 +894,30 @@ class UnitOfWork implements PropertyChangedListener
$actualData = array();
foreach ($class->reflFields as $name => $refProp) {
- if (( ! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity())
- && ($name !== $class->versionField)
- && ! $class->isCollectionValuedAssociation($name)) {
+ if ( ! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity()) {
$actualData[$name] = $refProp->getValue($entity);
}
}
- if ( ! isset($this->originalEntityData[$oid])) {
- throw new \RuntimeException('Cannot call recomputeSingleEntityChangeSet before computeChangeSet on an entity.');
- }
-
$originalData = $this->originalEntityData[$oid];
$changeSet = array();
foreach ($actualData as $propName => $actualValue) {
$orgValue = isset($originalData[$propName]) ? $originalData[$propName] : null;
- if ($orgValue !== $actualValue) {
+ if (is_object($orgValue) && $orgValue !== $actualValue) {
+ $changeSet[$propName] = array($orgValue, $actualValue);
+ } else if ($orgValue != $actualValue || ($orgValue === null ^ $actualValue === null)) {
$changeSet[$propName] = array($orgValue, $actualValue);
}
}
if ($changeSet) {
- $this->entityChangeSets[$oid] = (isset($this->entityChangeSets[$oid]))
- ? array_merge($this->entityChangeSets[$oid], $changeSet)
- : $changeSet;
+ if (isset($this->entityChangeSets[$oid])) {
+ $this->entityChangeSets[$oid] = array_merge($this->entityChangeSets[$oid], $changeSet);
+ }
$this->originalEntityData[$oid] = $actualData;
- $this->entityUpdates[$oid] = $entity;
}
}
@@ -2492,15 +2479,15 @@ class UnitOfWork implements PropertyChangedListener
? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
: $data[$fieldName];
}
+
+ $idHash = implode(' ', $id);
} else {
- $id = isset($class->associationMappings[$class->identifier[0]])
+ $idHash = isset($class->associationMappings[$class->identifier[0]])
? $data[$class->associationMappings[$class->identifier[0]]['joinColumns'][0]['name']]
: $data[$class->identifier[0]];
- $id = array($class->identifier[0] => $id);
+ $id = array($class->identifier[0] => $idHash);
}
-
- $idHash = implode(' ', $id);
if (isset($this->identityMap[$class->rootEntityName][$idHash])) {
$entity = $this->identityMap[$class->rootEntityName][$idHash];
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Version.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Version.php
index 1370e2f089..a1b25fc044 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.4.3';
+ const VERSION = '2.4.2';
/**
* Compares a Doctrine version with the current one.
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/CHANGELOG.md b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/CHANGELOG.md
index f673b8de68..aa12aa9795 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/CHANGELOG.md
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/CHANGELOG.md
@@ -1,6 +1,14 @@
CHANGELOG
=========
+3.0
+---
+
+ * fixed the Doctrine param converter that sent 500 when an entity was not found under some circumstancies
+ * ParamConverterInterface now uses ParamConverter as a type hint instead of ConfigurationInterface
+ * added support for @Security
+ * added support for HTTP validation cache in @Cache (ETag and LastModified)
+
2.2
---
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Cache.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Cache.php
index a18899ac65..ec2de01d15 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Cache.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Cache.php
@@ -1,7 +1,5 @@
* @Annotation
@@ -30,7 +30,7 @@ class Cache extends ConfigurationAnnotation
* The number of seconds that the response is considered fresh by a private
* cache like a web browser.
*
- * @var integer
+ * @var int
*/
protected $maxage;
@@ -38,14 +38,14 @@ class Cache extends ConfigurationAnnotation
* The number of seconds that the response is considered fresh by a public
* cache like a reverse proxy cache.
*
- * @var integer
+ * @var int
*/
protected $smaxage;
/**
- * Whether or not the response is public or not.
+ * Whether the response is public or not.
*
- * @var integer
+ * @var bool
*/
protected $public;
@@ -56,6 +56,20 @@ class Cache extends ConfigurationAnnotation
*/
protected $vary = array();
+ /**
+ * An expression to compute the Last-Modified HTTP header.
+ *
+ * @var string
+ */
+ protected $lastModified;
+
+ /**
+ * An expression to compute the ETag HTTP header.
+ *
+ * @var string
+ */
+ protected $etag;
+
/**
* Returns the expiration date for the Expires header field.
*
@@ -79,7 +93,7 @@ class Cache extends ConfigurationAnnotation
/**
* Sets the number of seconds for the max-age cache-control header field.
*
- * @param integer $maxage A number of seconds
+ * @param int $maxage A number of seconds
*/
public function setMaxAge($maxage)
{
@@ -90,7 +104,7 @@ class Cache extends ConfigurationAnnotation
* Returns the number of seconds the response is considered fresh by a
* private cache.
*
- * @return integer
+ * @return int
*/
public function getMaxAge()
{
@@ -100,7 +114,7 @@ class Cache extends ConfigurationAnnotation
/**
* Sets the number of seconds for the s-maxage cache-control header field.
*
- * @param integer $smaxage A number of seconds
+ * @param int $smaxage A number of seconds
*/
public function setSMaxAge($smaxage)
{
@@ -111,7 +125,7 @@ class Cache extends ConfigurationAnnotation
* Returns the number of seconds the response is considered fresh by a
* public cache.
*
- * @return integer
+ * @return int
*/
public function getSMaxAge()
{
@@ -121,21 +135,21 @@ class Cache extends ConfigurationAnnotation
/**
* Returns whether or not a response is public.
*
- * @return Boolean
+ * @return bool
*/
public function isPublic()
{
- return (Boolean) $this->public;
+ return (bool) $this->public;
}
/**
* Sets a response public.
*
- * @param Boolean $public A boolean value
+ * @param bool $public A boolean value
*/
public function setPublic($public)
{
- $this->public = (Boolean) $public;
+ $this->public = (bool) $public;
}
/**
@@ -158,6 +172,46 @@ class Cache extends ConfigurationAnnotation
$this->vary = $vary;
}
+ /**
+ * Sets the "Last-Modified"-header expression.
+ *
+ * @param string $expression
+ */
+ public function setLastModified($expression)
+ {
+ $this->lastModified = $expression;
+ }
+
+ /**
+ * Returns the "Last-Modified"-header expression.
+ *
+ * @return string
+ */
+ public function getLastModified()
+ {
+ return $this->lastModified;
+ }
+
+ /**
+ * Sets the "ETag"-header expression.
+ *
+ * @param string $expression
+ */
+ public function setETag($expression)
+ {
+ $this->etag = $expression;
+ }
+
+ /**
+ * Returns the "ETag"-header expression.
+ *
+ * @return string
+ */
+ public function getETag()
+ {
+ return $this->etag;
+ }
+
/**
* Returns the annotation alias name.
*
@@ -172,7 +226,7 @@ class Cache extends ConfigurationAnnotation
/**
* Only one cache directive is allowed
*
- * @return Boolean
+ * @return bool
* @see ConfigurationInterface
*/
public function allowArray()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationAnnotation.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationAnnotation.php
index 678de1aabf..9c7eb275d6 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationAnnotation.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationAnnotation.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Configuration;
/**
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationInterface.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationInterface.php
index 797c2c750a..d0d14688c1 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationInterface.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ConfigurationInterface.php
@@ -1,7 +1,5 @@
* @Annotation
@@ -68,9 +68,9 @@ class Method extends ConfigurationAnnotation
}
/**
- * Only one cache directive is allowed
+ * Only one method directive is allowed
*
- * @return Boolean
+ * @return bool
* @see ConfigurationInterface
*/
public function allowArray()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ParamConverter.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ParamConverter.php
index cecb191a93..7b5546f5be 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ParamConverter.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/ParamConverter.php
@@ -1,7 +1,5 @@
optional = (Boolean) $optional;
+ $this->optional = (bool) $optional;
}
/**
* Returns whether or not the parameter is optional.
*
- * @return Boolean
+ * @return bool
*/
public function isOptional()
{
@@ -180,7 +180,7 @@ class ParamConverter extends ConfigurationAnnotation
/**
* Multiple ParamConverters are allowed
*
- * @return Boolean
+ * @return bool
* @see ConfigurationInterface
*/
public function allowArray()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Route.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Route.php
index 4c77c4acfd..1e50d3fdf7 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Route.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Route.php
@@ -1,18 +1,18 @@
*
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
+namespace Sensio\Bundle\FrameworkExtraBundle\Configuration;
+
+use Symfony\Component\Routing\Annotation\Route as BaseRoute;
+
/**
* @author Kris Wallsmith
* @Annotation
@@ -34,7 +34,7 @@ class Route extends BaseRoute
/**
* Multiple route annotations are allowed
*
- * @return Boolean
+ * @return bool
* @see ConfigurationInterface
*/
public function allowArray()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Template.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Template.php
index 4f24df1bb5..13c70db667 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Template.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Configuration/Template.php
@@ -1,9 +1,5 @@
* @Annotation
@@ -45,7 +45,7 @@ class Template extends ConfigurationAnnotation
/**
* Should the template be streamed?
*
- * @var Boolean
+ * @var bool
*/
protected $streamable = false;
@@ -60,7 +60,7 @@ class Template extends ConfigurationAnnotation
}
/**
- * @param Boolean $streamable
+ * @param bool $streamable
*/
public function setIsStreamable($streamable)
{
@@ -68,11 +68,11 @@ class Template extends ConfigurationAnnotation
}
/**
- * @return Boolean
+ * @return bool
*/
public function isStreamable()
{
- return (Boolean) $this->streamable;
+ return (bool) $this->streamable;
}
/**
@@ -149,7 +149,7 @@ class Template extends ConfigurationAnnotation
/**
* Only one template directive is allowed
*
- * @return Boolean
+ * @return bool
* @see ConfigurationInterface
*/
public function allowArray()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/Configuration.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/Configuration.php
index 9f12c88a1c..92d1695fd5 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/Configuration.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -35,6 +44,7 @@ class Configuration implements ConfigurationInterface
->addDefaultsIfNotSet()
->children()
->booleanNode('converters')->defaultTrue()->end()
+ ->booleanNode('auto_convert')->defaultTrue()->end()
->end()
->end()
->arrayNode('view')
@@ -49,6 +59,13 @@ class Configuration implements ConfigurationInterface
->booleanNode('annotations')->defaultTrue()->end()
->end()
->end()
+ ->arrayNode('security')
+ ->addDefaultsIfNotSet()
+ ->children()
+ ->booleanNode('annotations')->defaultTrue()->end()
+ ->scalarNode('expression_language')->defaultValue('sensio_framework_extra.security.expression_language.default')->end()
+ ->end()
+ ->end()
->end()
;
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/SensioFrameworkExtraExtension.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/SensioFrameworkExtraExtension.php
index 535cb9656b..45cd32a40e 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/SensioFrameworkExtraExtension.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/DependencyInjection/SensioFrameworkExtraExtension.php
@@ -1,12 +1,5 @@
addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\CacheListener',
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
+ ));
+ }
+
+ if ($config['security']['annotations']) {
+ $annotationsToLoad[] = 'security.xml';
+
+ $container->setAlias('sensio_framework_extra.security.expression_language', $config['security']['expression_language']);
+ $container->getAlias('sensio_framework_extra.security.expression_language')->setPublic(false);
+
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
));
}
@@ -75,13 +86,17 @@ class SensioFrameworkExtraExtension extends Extension
// must be first
$loader->load('annotations.xml');
- foreach ($annotationsToLoad as $config) {
- $loader->load($config);
+ foreach ($annotationsToLoad as $configFile) {
+ $loader->load($configFile);
}
$this->addClassesToCompile(array(
'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
));
+
+ if ($config['request']['converters']) {
+ $container->getDefinition('sensio_framework_extra.converter.listener')->replaceArgument(1, $config['request']['auto_convert']);
+ }
}
}
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/CacheListener.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/CacheListener.php
index d1282837f9..0b03406ad3 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/CacheListener.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/CacheListener.php
@@ -1,11 +1,5 @@
+ * It can be configured via the Cache, LastModified, and Etag annotations.
+ *
+ * @author Fabien Potencier
+ *
+ * @deprecated Deprecated since 3.0, to be removed in 4.0. Use the HttpCacheListener instead.
*/
-class CacheListener implements EventSubscriberInterface
+class CacheListener extends HttpCacheListener
{
- /**
- * Modifies the response to apply HTTP expiration header fields.
- *
- * @param FilterResponseEvent $event The notified event
- */
- public function onKernelResponse(FilterResponseEvent $event)
- {
- if (!$configuration = $event->getRequest()->attributes->get('_cache')) {
- return;
- }
-
- $response = $event->getResponse();
-
- if (!$response->isSuccessful()) {
- return;
- }
-
- if (null !== $configuration->getSMaxAge()) {
- $response->setSharedMaxAge($configuration->getSMaxAge());
- }
-
- if (null !== $configuration->getMaxAge()) {
- $response->setMaxAge($configuration->getMaxAge());
- }
-
- if (null !== $configuration->getExpires()) {
- $date = \DateTime::createFromFormat('U', strtotime($configuration->getExpires()), new \DateTimeZone('UTC'));
- $response->setExpires($date);
- }
-
- if (null !== $configuration->getVary()) {
- $response->setVary($configuration->getVary());
- }
-
- if ($configuration->isPublic()) {
- $response->setPublic();
- }
-
- $event->setResponse($response);
- }
-
- public static function getSubscribedEvents()
- {
- return array(
- KernelEvents::RESPONSE => 'onKernelResponse',
- );
- }
}
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/ControllerListener.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/ControllerListener.php
index f77d4577e6..211de148b3 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/ControllerListener.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/ControllerListener.php
@@ -1,14 +1,5 @@
*/
@@ -29,14 +30,18 @@ class ParamConverterListener implements EventSubscriberInterface
*/
protected $manager;
+ protected $autoConvert;
+
/**
* Constructor.
*
- * @param ParamConverterManager $manager A ParamConverterManager instance
+ * @param ParamConverterManager $manager A ParamConverterManager instance
+ * @param bool $autoConvert Auto convert non-configured objects
*/
- public function __construct(ParamConverterManager $manager)
+ public function __construct(ParamConverterManager $manager, $autoConvert = true)
{
$this->manager = $manager;
+ $this->autoConvert = $autoConvert;
}
/**
@@ -63,6 +68,15 @@ class ParamConverterListener implements EventSubscriberInterface
}
// automatically apply conversion for non-configured objects
+ if ($this->autoConvert) {
+ $configurations = $this->autoConfigure($r, $request, $configurations);
+ }
+
+ $this->manager->apply($request, $configurations);
+ }
+
+ private function autoConfigure(\ReflectionFunctionAbstract $r, Request $request, $configurations)
+ {
foreach ($r->getParameters() as $param) {
if (!$param->getClass() || $param->getClass()->isInstance($request)) {
continue;
@@ -83,9 +97,14 @@ class ParamConverterListener implements EventSubscriberInterface
$configurations[$name]->setIsOptional($param->isOptional());
}
- $this->manager->apply($request, $configurations);
+ return $configurations;
}
+ /**
+ * Get subscribed events
+ *
+ * @return array Subscribed events
+ */
public static function getSubscribedEvents()
{
return array(
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/TemplateListener.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/TemplateListener.php
index 255f67a2cb..be4832cd82 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/TemplateListener.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/EventListener/TemplateListener.php
@@ -1,5 +1,14 @@
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\EventListener;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -10,19 +19,10 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-/*
- * This file is part of the Symfony framework.
- *
- * (c) Fabien Potencier
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
/**
- * The TemplateListener class handles the @Template annotation.
+ * The TemplateListener class handles the Template annotation.
*
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class TemplateListener implements EventSubscriberInterface
{
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/README.md b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/README.md
index 00918aebb3..417a22a84d 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/README.md
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/README.md
@@ -4,3 +4,9 @@ SensioFrameworkExtraBundle
This bundle provides a way to configure your controllers with annotations.
Read about it on its [official homepage](http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html).
+
+As of v3.0.0 of the bundle, the release cycle is de-synchronized from the
+framework's. It means you can just require "sensio/framework-extra-bundle":
+"~3.0" in your composer.json and Composer will automatically pick the latest
+version of the bundle that works with your current version of Symfony. The
+minimum version of Symfony2 for this workflow is 2.4.0.
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DateTimeParamConverter.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DateTimeParamConverter.php
index fe4a8c0e61..49f4656583 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DateTimeParamConverter.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DateTimeParamConverter.php
@@ -11,7 +11,7 @@
namespace Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use DateTime;
@@ -24,11 +24,11 @@ use DateTime;
class DateTimeParamConverter implements ParamConverterInterface
{
/**
- * @{inheritdoc}
- *
+ * {@inheritdoc}
+ *
* @throws NotFoundHttpException When invalid date given
*/
- public function apply(Request $request, ConfigurationInterface $configuration)
+ public function apply(Request $request, ParamConverter $configuration)
{
$param = $configuration->getName();
@@ -39,6 +39,10 @@ class DateTimeParamConverter implements ParamConverterInterface
$options = $configuration->getOptions();
$value = $request->attributes->get($param);
+ if (!$value && $configuration->isOptional()) {
+ return false;
+ }
+
$date = isset($options['format'])
? DateTime::createFromFormat($options['format'], $value)
: new DateTime($value);
@@ -53,9 +57,9 @@ class DateTimeParamConverter implements ParamConverterInterface
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
- public function supports(ConfigurationInterface $configuration)
+ public function supports(ParamConverter $configuration)
{
if (null === $configuration->getClass()) {
return false;
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php
index f9a1e78326..cb2152a2a3 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php
@@ -1,21 +1,21 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpFoundation\Request;
use Doctrine\Common\Persistence\ManagerRegistry;
-
-/*
- * This file is part of the Symfony framework.
- *
- * (c) Fabien Potencier
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
+use Doctrine\ORM\NoResultException;
/**
* DoctrineParamConverter.
@@ -35,12 +35,12 @@ class DoctrineParamConverter implements ParamConverterInterface
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*
* @throws \LogicException When unable to guess how to get a Doctrine instance from the request information
* @throws NotFoundHttpException When object not found
*/
- public function apply(Request $request, ConfigurationInterface $configuration)
+ public function apply(Request $request, ParamConverter $configuration)
{
$name = $configuration->getName();
$class = $configuration->getClass();
@@ -89,7 +89,11 @@ class DoctrineParamConverter implements ParamConverterInterface
$method = 'find';
}
- return $this->getManager($options['entity_manager'], $class)->getRepository($class)->$method($id);
+ try {
+ return $this->getManager($options['entity_manager'], $class)->getRepository($class)->$method($id);
+ } catch (NoResultException $e) {
+ return null;
+ }
}
protected function getIdentifier(Request $request, $options, $name)
@@ -157,18 +161,18 @@ class DoctrineParamConverter implements ParamConverterInterface
$method = 'findOneBy';
}
- return $em->getRepository($class)->$method($criteria);
+ try {
+ return $em->getRepository($class)->$method($criteria);
+ } catch (NoResultException $e) {
+ return null;
+ }
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
- public function supports(ConfigurationInterface $configuration)
+ public function supports(ParamConverter $configuration)
{
- if (!$configuration instanceof ParamConverter) {
- return false;
- }
-
// if there is no manager, this means that only Doctrine DBAL is configured
if (null === $this->registry || !count($this->registry->getManagers())) {
return false;
@@ -189,7 +193,7 @@ class DoctrineParamConverter implements ParamConverterInterface
return ! $em->getMetadataFactory()->isTransient($configuration->getClass());
}
- protected function getOptions(ConfigurationInterface $configuration)
+ protected function getOptions(ParamConverter $configuration)
{
return array_replace(array(
'entity_manager' => null,
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterInterface.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterInterface.php
index 52acfd004c..4703d83edf 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterInterface.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterInterface.php
@@ -1,19 +1,19 @@
*
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
+namespace Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Symfony\Component\HttpFoundation\Request;
+
/**
* Converts request parameters to objects and stores them as request
* attributes, so they can be injected as controller method arguments.
@@ -24,20 +24,20 @@ interface ParamConverterInterface
{
/**
* Stores the object in the request.
- *
- * @param Request $request The request
- * @param ConfigurationInterface $configuration Contains the name, class and options of the object
- *
- * @return boolean True if the object has been successfully set, else false
+ *
+ * @param Request $request The request
+ * @param ParamConverter $configuration Contains the name, class and options of the object
+ *
+ * @return bool True if the object has been successfully set, else false
*/
- function apply(Request $request, ConfigurationInterface $configuration);
+ public function apply(Request $request, ParamConverter $configuration);
/**
* Checks if the object is supported.
- *
- * @param ConfigurationInterface $configuration Should be an instance of ParamConverter
- *
- * @return boolean True if the object is supported, else false
+ *
+ * @param ParamConverter $configuration Should be an instance of ParamConverter
+ *
+ * @return bool True if the object is supported, else false
*/
- function supports(ConfigurationInterface $configuration);
+ public function supports(ParamConverter $configuration);
}
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterManager.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterManager.php
index 3166dcfb62..ddfa96cf21 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterManager.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/ParamConverterManager.php
@@ -1,19 +1,19 @@
*
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
+namespace Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
+
+use Symfony\Component\HttpFoundation\Request;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
+
/**
* Managers converters.
*
@@ -62,7 +62,7 @@ class ParamConverterManager
$className = $configuration->getClass();
// If the value is already an instance of the class we are trying to convert it into
- // we should continue as no convertion is required
+ // we should continue as no conversion is required
if (is_object($value) && $value instanceof $className) {
return;
}
@@ -107,7 +107,7 @@ class ParamConverterManager
* be invoked explicitly.
*
* @param ParamConverterInterface $converter A ParamConverterInterface instance
- * @param integer $priority The priority (between -10 and 10).
+ * @param int $priority The priority (between -10 and 10).
* @param string $name Name of the converter.
*/
public function add(ParamConverterInterface $converter, $priority = 0, $name = null)
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/cache.xml b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/cache.xml
index 47e1050875..dd069733da 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/cache.xml
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/cache.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/converters.xml b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/converters.xml
index 6f8129546b..1f951343cb 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/converters.xml
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/config/converters.xml
@@ -15,6 +15,7 @@
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/cache.rst b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/cache.rst
index 3c68e0fb07..bf29ab6d21 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/cache.rst
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/cache.rst
@@ -1,24 +1,28 @@
@Cache
======
-Usage
------
+The ``@Cache`` annotation makes it easy to define HTTP caching headers for
+expiration and validation.
+
+HTTP Expiration Strategies
+--------------------------
The ``@Cache`` annotation makes it easy to define HTTP caching::
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
/**
- * @Cache(expires="tomorrow", public="true")
+ * @Cache(expires="tomorrow", public=true)
*/
public function indexAction()
{
}
-You can also use the annotation on a class to define caching for all methods::
+You can also use the annotation on a class to define caching for all actions
+of a controller::
/**
- * @Cache(expires="tomorrow", public="true")
+ * @Cache(expires="tomorrow", public=true)
*/
class BlogController extends Controller
{
@@ -40,22 +44,63 @@ configuration, the latter overrides the former::
}
}
-Attributes
-----------
+.. note::
-Here is a list of accepted attributes and their HTTP header equivalent:
+ The ``expires`` attribute takes any valid date understood by the PHP
+ ``strtotime()`` function.
+
+HTTP Validation Strategies
+--------------------------
+
+The ``lastModified`` and ``ETag`` attributes manages the HTTP validation cache
+headers. ``lastModified`` adds a ``Last-Modified`` header to Responses and
+``ETag`` adds an ``ETag`` header.
+
+Both automatically trigger the logic to return a 304 response when the
+response is not modified (in this case, the controller is **not** called)::
+
+ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+
+ /**
+ * @Cache(lastModified="post.getUpdatedAt()", ETag="'Post' ~ post.getId() ~ post.getUpdatedAt()")
+ */
+ public function indexAction(Post $post)
+ {
+ // your code
+ // won't be called in case of a 304
+ }
+
+It's roughly doing the same as the following code::
+
+ public function myAction(Request $request, Post $post)
+ {
+ $response = new Response();
+ $response->setLastModified($post->getUpdatedAt());
+ if ($response->isNotModified($request)) {
+ return $response;
+ }
-============================== ===============
-Annotation Response Method
-============================== ===============
-``@Cache(expires="tomorrow")`` ``$response->setExpires()``
-``@Cache(smaxage="15")`` ``$response->setSharedMaxAge()``
-``@Cache(maxage="15")`` ``$response->setMaxAge()``
-``@Cache(vary=["Cookie"])`` ``$response->setVary()``
-``@Cache(public="true")`` ``$response->setPublic()``
-============================== ===============
+ // your code
+ }
.. note::
- The ``expires`` attribute takes any valid date understood by the PHP
- ``strtotime()`` function.
+ The ETag HTTP header value is the result of the expression hashed with the
+ ``sha256`` algorithm.
+
+Attributes
+----------
+
+Here is a list of accepted attributes and their HTTP header equivalent:
+
+===================================================== ================================
+Annotation Response Method
+===================================================== ================================
+``@Cache(expires="tomorrow")`` ``$response->setExpires()``
+``@Cache(smaxage="15")`` ``$response->setSharedMaxAge()``
+``@Cache(maxage="15")`` ``$response->setMaxAge()``
+``@Cache(vary={"Cookie"})`` ``$response->setVary()``
+``@Cache(public=true)`` ``$response->setPublic()``
+``@Cache(lastModified="post.getUpdatedAt()")`` ``$response->setLastModified()``
+``@Cache(ETag="post.getId() ~ post.getUpdatedAt()")`` ``$response->setETag()``
+===================================================== ================================
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/converters.rst b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/converters.rst
index 10192e91db..d8432057d2 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/converters.rst
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/converters.rst
@@ -19,7 +19,7 @@ they can be injected as controller method arguments::
{
}
-Several things happens under the hood:
+Several things happen under the hood:
* The converter tries to get a ``SensioBlogBundle:Post`` object from the
request attributes (request attributes comes from route placeholders -- here
@@ -41,6 +41,27 @@ If you use type hinting as in the example above, you can even omit the
{
}
+.. tip::
+
+ You can disable the auto-conversion of type-hinted method arguments feature
+ by setting the ``auto_convert`` flag to ``false``:
+
+ .. configuration-block::
+
+ .. code-block:: yaml
+
+ # app/config/config.yml
+ sensio_framework_extra:
+ request:
+ converters: true
+ auto_convert: false
+
+ .. code-block:: xml
+
+
+
+
+
To detect which converter is run on a parameter the following process is run:
* If an explicit converter choice was made with
@@ -54,7 +75,7 @@ To detect which converter is run on a parameter the following process is run:
Built-in Converters
-------------------
-The bundle has two built-in converter, the Doctrine one and a DateTime
+The bundle has two built-in converters, the Doctrine one and a DateTime
converter.
Doctrine Converter
@@ -65,7 +86,7 @@ Converter Name: ``doctrine.orm``
The Doctrine Converter attempts to convert request attributes to Doctrine
entities fetched from the database. Two different approaches are possible:
-- Fetch object by primary key
+- Fetch object by primary key.
- Fetch object by one or several fields which contain unique values in the
database.
@@ -102,6 +123,11 @@ option::
{
}
+.. tip::
+
+ The ``id`` option specifies which placeholder from the route gets passed to the repository
+ method used. If no repository method is specified, ``find()`` is used by default.
+
This also allows you to have multiple converters in one action::
/**
@@ -112,7 +138,7 @@ This also allows you to have multiple converters in one action::
{
}
-In the example above, the post parameter is handled automatically, but the comment is
+In the example above, the ``$post`` parameter is handled automatically, but ``$comment`` is
configured with the annotation since they can not both follow the default convention.
If you want to match an entity using multiple fields use the ``mapping`` hash
@@ -133,7 +159,7 @@ route parameter from being part of the criteria::
/**
* @Route("/blog/{date}/{slug}")
- * @ParamConverter("post", options={"exclude": ["date"]})
+ * @ParamConverter("post", options={"exclude": {"date"}})
*/
public function showAction(Post $post, \DateTime $date)
{
@@ -180,37 +206,36 @@ is accepted. You can be stricter with input given through the options::
Creating a Converter
--------------------
-All converters must implement the
-:class:`Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface`::
+All converters must implement the ``ParamConverterInterface``::
namespace Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
- use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
+ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\HttpFoundation\Request;
interface ParamConverterInterface
{
- function apply(Request $request, ConfigurationInterface $configuration);
+ function apply(Request $request, ParamConverter $configuration);
- function supports(ConfigurationInterface $configuration);
+ function supports(ParamConverter $configuration);
}
The ``supports()`` method must return ``true`` when it is able to convert the
given configuration (a ``ParamConverter`` instance).
-The ``ParamConverter`` instance has three information about the annotation:
+The ``ParamConverter`` instance has three pieces of information about the annotation:
* ``name``: The attribute name;
* ``class``: The attribute class name (can be any string representing a class
name);
-* ``options``: An array of options
+* ``options``: An array of options.
The ``apply()`` method is called whenever a configuration is supported. Based
on the request attributes, it should set an attribute named
``$configuration->getName()``, which stores an object of class
``$configuration->getClass()``.
-To register your converter service you must add a tag to your service
+To register your converter service you must add a tag to your service:
.. configuration-block::
@@ -235,6 +260,11 @@ the converter stack with a priority of `0`. To explicitly disable the
registration by priority you have to set `priority="false"` in your tag
definition.
+.. tip::
+
+ If you would like to inject services or additional arguments to custom param converter, the priority shouldn't
+ be higher than 1. Otherwise, the service wouldn't be loaded.
+
.. tip::
Use the ``DoctrineParamConverter`` class as a template for your own converters.
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/routing.rst b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/routing.rst
index 8e4d91f89e..0446333a00 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/routing.rst
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/routing.rst
@@ -4,7 +4,7 @@
Usage
-----
-The @Route annotation maps a route pattern with a controller::
+The ``@Route`` annotation maps a route pattern with a controller::
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -25,7 +25,7 @@ URL. This is equivalent to the following YAML configuration:
.. code-block:: yaml
blog_home:
- pattern: /
+ path: /
defaults: { _controller: SensioBlogBundle:Post:index }
Like any route pattern, you can define placeholders, requirements, and default
@@ -115,7 +115,8 @@ Route Prefix
------------
A ``@Route`` annotation on a controller class defines a prefix for all action
-routes::
+routes (note that you cannot have more than one ``@Route`` annotation on a
+class)::
/**
* @Route("/blog")
@@ -172,7 +173,7 @@ PostController()`` itself::
/**
* @Route(service="my_post_controller_service")
*/
- class PostController extends Controller
+ class PostController
{
// ...
}
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/index.rst b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/index.rst
index b973754439..1eda2bf96a 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/index.rst
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/index.rst
@@ -41,29 +41,32 @@ The default configuration is as follow:
.. code-block:: yaml
sensio_framework_extra:
- router: { annotations: true }
- request: { converters: true }
- view: { annotations: true }
- cache: { annotations: true }
+ router: { annotations: true }
+ request: { converters: true, auto_convert: true }
+ view: { annotations: true }
+ cache: { annotations: true }
+ security: { annotations: true }
.. code-block:: xml
-
+
+
.. code-block:: php
// load the profiler
$container->loadFromExtension('sensio_framework_extra', array(
- 'router' => array('annotations' => true),
- 'request' => array('converters' => true),
- 'view' => array('annotations' => true),
- 'cache' => array('annotations' => true),
+ 'router' => array('annotations' => true),
+ 'request' => array('converters' => true, 'auto_convert' => true),
+ 'view' => array('annotations' => true),
+ 'cache' => array('annotations' => true),
+ 'security' => array('annotations' => true),
));
You can disable some annotations and conventions by defining one or more
@@ -98,6 +101,7 @@ The following annotations are defined by the bundle:
annotations/converters
annotations/view
annotations/cache
+ annotations/security
This example shows all the available annotations in action::
@@ -106,6 +110,7 @@ This example shows all the available annotations in action::
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
/**
* @Route("/blog")
@@ -128,8 +133,9 @@ This example shows all the available annotations in action::
* @Route("/{id}")
* @Method("GET")
* @ParamConverter("post", class="SensioBlogBundle:Post")
- * @Template("SensioBlogBundle:Annot:post.html.twig", vars={"post"})
- * @Cache(smaxage="15")
+ * @Template("SensioBlogBundle:Annot:show.html.twig", vars={"post"})
+ * @Cache(smaxage="15", lastmodified="post.getUpdatedAt()", etag="'Post' ~ post.getId() ~ post.getUpdatedAt()")
+ * @Security("has_role('ROLE_ADMIN') and is_granted('POST_SHOW', post)")
*/
public function showAction(Post $post)
{
@@ -141,7 +147,8 @@ annotations::
/**
* @Route("/{id}")
- * @Cache(smaxage="15")
+ * @Cache(smaxage="15", lastModified="post.getUpdatedAt()", ETag="'Post' ~ post.getId() ~ post.getUpdatedAt()")
+ * @Security("has_role('ROLE_ADMIN') and is_granted('POST_SHOW', post)")
*/
public function showAction(Post $post)
{
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Routing/AnnotatedRouteControllerLoader.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Routing/AnnotatedRouteControllerLoader.php
index cb2f76375b..7ce03bcb41 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Routing/AnnotatedRouteControllerLoader.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Routing/AnnotatedRouteControllerLoader.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Routing;
use Symfony\Component\Routing\Loader\AnnotationClassLoader;
@@ -7,15 +16,6 @@ use Symfony\Component\Routing\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route as FrameworkExtraBundleRoute;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-/*
- * This file is part of the Symfony framework.
- *
- * (c) Fabien Potencier
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
/**
* AnnotatedRouteControllerLoader is an implementation of AnnotationClassLoader
* that sets the '_controller' default based on the class and method names.
@@ -57,6 +57,19 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
}
}
+ protected function getGlobals(\ReflectionClass $class)
+ {
+ $globals = parent::getGlobals($class);
+
+ foreach ($this->reader->getClassAnnotations($class) as $configuration) {
+ if ($configuration instanceof Method) {
+ $globals['methods'] = array_merge($globals['methods'], $configuration->getMethods());
+ }
+ }
+
+ return $globals;
+ }
+
/**
* Makes the default route name more sane by removing common keywords.
*
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Templating/TemplateGuesser.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Templating/TemplateGuesser.php
index e002c677d8..9e3ed13840 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Templating/TemplateGuesser.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Templating/TemplateGuesser.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Templating;
use Symfony\Component\HttpKernel\KernelInterface;
@@ -7,15 +16,6 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
use Doctrine\Common\Util\ClassUtils;
-/*
- * This file is part of the Symfony framework.
- *
- * (c) Fabien Potencier
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
/**
* The TemplateGuesser class handles the guessing of template name based on controller
*
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Configuration/ConfigurationAnnotationTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Configuration/ConfigurationAnnotationTest.php
index 2725d6b64d..a6e76a59e6 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Configuration/ConfigurationAnnotationTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Configuration/ConfigurationAnnotationTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\Configuration;
class ConfigurationAnnotationTest extends \PHPUnit_Framework_TestCase
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ControllerListenerTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ControllerListenerTest.php
index 9c4257b496..ec7e5f860e 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ControllerListenerTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ControllerListenerTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\EventListener;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
@@ -20,6 +29,9 @@ class ControllerListenerTest extends \PHPUnit_Framework_TestCase
{
$this->listener = new ControllerListener(new AnnotationReader());
$this->request = $this->createRequest();
+
+ // trigger the autoloading of the @Cache annotation
+ class_exists('Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache');
}
public function tearDown()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ParamConverterListenerTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ParamConverterListenerTest.php
index 91b5c99106..27c77dbaab 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ParamConverterListenerTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/EventListener/ParamConverterListenerTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\EventListener;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -12,22 +21,60 @@ class ParamConverterListenerTest extends \PHPUnit_Framework_TestCase
{
public function testRequestIsSkipped()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
$request = new Request();
- $manager = $this->getMock('Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager');
- $manager->expects($this->once())
- ->method('apply')
- ->with($this->equalTo($request), $this->equalTo(array()));
+ $listener = new ParamConverterListener($this->getParamConverterManager($request, array()));
+ $event = new FilterControllerEvent($kernel, array(new TestController(), 'noArgAction'), $request, null);
+
+ $listener->onKernelController($event);
+ }
+
+ public function testAutoConvert()
+ {
+ $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $request = new Request(array(), array(), array('date' => '2014-03-14 09:00:00'));
+
+ $converter = new ParamConverter(array('name' => 'date', 'class' => 'DateTime'));
- $listener = new ParamConverterListener($manager);
- $event = new FilterControllerEvent($kernel, array(new TestController(), 'execute'), $request, null);
+ $listener = new ParamConverterListener($this->getParamConverterManager($request, array('date' => $converter)));
+ $event = new FilterControllerEvent($kernel, array(new TestController(), 'dateAction'), $request, null);
$listener->onKernelController($event);
}
+
+
+ public function testNoAutoConvert()
+ {
+ $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $request = new Request(array(), array(), array('date' => '2014-03-14 09:00:00'));
+
+ $listener = new ParamConverterListener($this->getParamConverterManager($request, array()), false);
+ $event = new FilterControllerEvent($kernel, array(new TestController(), 'dateAction'), $request, null);
+
+ $listener->onKernelController($event);
+ }
+
+ protected function getParamConverterManager(Request $request, $configurations)
+ {
+ $manager = $this->getMock('Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager');
+ $manager
+ ->expects($this->once())
+ ->method('apply')
+ ->with($this->equalTo($request), $this->equalTo($configurations))
+ ;
+
+ return $manager;
+ }
}
class TestController
{
- public function execute(Request $request) {}
+ public function noArgAction(Request $request)
+ {
+ }
+
+ public function dateAction(\DateTime $date)
+ {
+ }
}
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DateTimeParamConverterTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DateTimeParamConverterTest.php
index b3cbfa4f3a..4a54d81238 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DateTimeParamConverterTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DateTimeParamConverterTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\Request\ParamConverter;
use Symfony\Component\HttpFoundation\Request;
@@ -47,12 +56,26 @@ class DateTimeParamConverterTest extends \PHPUnit_Framework_TestCase
$this->converter->apply($request, $config);
}
+ public function testApplyOptionalWithEmptyAttribute()
+ {
+ $request = new Request(array(), array(), array('start' => null));
+ $config = $this->createConfiguration('DateTime', 'start');
+ $config->expects($this->once())
+ ->method('isOptional')
+ ->will($this->returnValue(true));
+
+ $this->assertFalse($this->converter->apply($request, $config));
+ $this->assertNull($request->attributes->get('start'));
+ }
+
public function createConfiguration($class = null, $name = null)
{
- $config = $this->getMock(
- 'Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface', array(
- 'getClass', 'getAliasName', 'getOptions', 'getName', 'allowArray'
- ));
+ $config = $this
+ ->getMockBuilder('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter')
+ ->setMethods(array('getClass', 'getAliasName', 'getOptions', 'getName', 'allowArray', 'isOptional'))
+ ->disableOriginalConstructor()
+ ->getMock();
+
if ($name !== null) {
$config->expects($this->any())
->method('getName')
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php
index d87e2b99d0..4f1f32bb50 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\Request\ParamConverter;
use Symfony\Component\HttpFoundation\Request;
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/ParamConverterManagerTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/ParamConverterManagerTest.php
index 7c26206fd3..40cb0d7aa9 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/ParamConverterManagerTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/ParamConverterManagerTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\Request\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager;
@@ -8,25 +17,18 @@ use Symfony\Component\HttpFoundation\Request;
class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
{
- public function setUp()
- {
- $this->manager = new ParamConverterManager();
- }
-
public function testPriorities()
{
- $this->assertEquals(array(), $this->manager->all());
+ $manager = new ParamConverterManager();
+ $this->assertEquals(array(), $manager->all());
$high = $this->createParamConverterMock();
$low = $this->createParamConverterMock();
- $this->manager->add($low);
- $this->manager->add($high, 10);
+ $manager->add($low);
+ $manager->add($high, 10);
- $this->assertEquals(array(
- $high,
- $low,
- ), $this->manager->all());
+ $this->assertEquals(array($high, $low), $manager->all());
}
public function testApply()
@@ -60,9 +62,10 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
)),
);
- $this->manager->add($supported);
- $this->manager->add($invalid);
- $this->manager->apply(new Request(), $configurations);
+ $manager = new ParamConverterManager();
+ $manager->add($supported);
+ $manager->add($invalid);
+ $manager->apply(new Request(), $configurations);
}
public function testApplyNamedConverter()
@@ -79,8 +82,6 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
->method('apply')
;
- $this->manager->add($converter, 0, "test");
-
$request = new Request();
$request->attributes->set('param', '1234');
@@ -90,9 +91,15 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
'converter' => 'test',
));
- $this->manager->apply($request, array($configuration));
+ $manager = new ParamConverterManager();
+ $manager->add($converter, 0, "test");
+ $manager->apply($request, array($configuration));
}
+ /**
+ * @expectedException \RuntimeException
+ * @expectedExceptionMessage Converter 'test' does not support conversion of parameter 'param'.
+ */
public function testApplyNamedConverterNotSupportsParameter()
{
$converter = $this->createParamConverterMock();
@@ -102,8 +109,6 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(false))
;
- $this->manager->add($converter, 0, "test");
-
$request = new Request();
$request->attributes->set('param', '1234');
@@ -113,10 +118,15 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
'converter' => 'test',
));
- $this->setExpectedException("RuntimeException", "Converter 'test' does not support conversion of parameter 'param'.");
- $this->manager->apply($request, array($configuration));
+ $manager = new ParamConverterManager();
+ $manager->add($converter, 0, "test");
+ $manager->apply($request, array($configuration));
}
+ /**
+ * @expectedException \RuntimeException
+ * @expectedExceptionMessage No converter named 'test' found for conversion of parameter 'param'.
+ */
public function testApplyNamedConverterNoConverter()
{
$request = new Request();
@@ -128,13 +138,12 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
'converter' => 'test',
));
- $this->setExpectedException("RuntimeException", "No converter named 'test' found for conversion of parameter 'param'.");
- $this->manager->apply($request, array($configuration));
+ $manager = new ParamConverterManager();
+ $manager->apply($request, array($configuration));
}
public function testApplyNotCalledOnAlreadyConvertedObjects()
{
-
$converter = $this->createParamConverterMock();
$converter
->expects($this->never())
@@ -146,8 +155,6 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
->method('apply')
;
- $this->manager->add($converter);
-
$request = new Request();
$request->attributes->set('converted', new \stdClass);
@@ -156,7 +163,9 @@ class ParamConverterManagerTest extends \PHPUnit_Framework_TestCase
'class' => 'stdClass',
));
- $this->manager->apply($request, array($configuration));
+ $manager = new ParamConverterManager();
+ $manager->add($converter);
+ $manager->apply($request, array($configuration));
}
protected function createParamConverterMock()
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Routing/AnnotatedRouteControllerLoaderTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Routing/AnnotatedRouteControllerLoaderTest.php
index a8b0056e2d..a55295de04 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Routing/AnnotatedRouteControllerLoaderTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Routing/AnnotatedRouteControllerLoaderTest.php
@@ -1,8 +1,22 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\Routing;
-use \Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Doctrine\Common\Annotations\SimpleAnnotationReader;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader;
+use Symfony\Component\Routing\Route as SymfonyRoute;
class AnnotatedRouteControllerLoaderTest extends \PHPUnit_Framework_TestCase
{
@@ -106,4 +120,21 @@ class AnnotatedRouteControllerLoaderTest extends \PHPUnit_Framework_TestCase
null
);
}
+
+ public function testLoad()
+ {
+ $loader = new AnnotatedRouteControllerLoader(new AnnotationReader());
+ AnnotationRegistry::registerLoader('class_exists');
+
+ $rc = $loader->load('Sensio\Bundle\FrameworkExtraBundle\Tests\Routing\Fixtures\FoobarController');
+
+ $this->assertInstanceOf('Symfony\Component\Routing\RouteCollection', $rc);
+ $this->assertCount(2, $rc);
+
+ $this->assertInstanceOf('Symfony\Component\Routing\Route', $rc->get('index'));
+ $this->assertEquals(array('GET'), $rc->get('index')->getMethods());
+
+ $this->assertInstanceOf('Symfony\Component\Routing\Route', $rc->get('new'));
+ $this->assertEquals(array('POST'), $rc->get('new')->getMethods());
+ }
}
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Templating/TemplateGuesserTest.php b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Templating/TemplateGuesserTest.php
index 7afc89ab3b..873976a715 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Templating/TemplateGuesserTest.php
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Templating/TemplateGuesserTest.php
@@ -1,5 +1,14 @@
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Sensio\Bundle\FrameworkExtraBundle\Tests\Templating;
use Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser;
diff --git a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/composer.json b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/composer.json
index 1551d5bfdd..13e58a9ccb 100644
--- a/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/composer.json
+++ b/vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/composer.json
@@ -11,16 +11,24 @@
}
],
"require": {
- "symfony/framework-bundle": "~2.2",
+ "symfony/framework-bundle": "~2.5",
"doctrine/common": "~2.2"
},
+ "require-dev": {
+ "symfony/expression-language": "~2.4",
+ "symfony/security-bundle": "~2.4"
+ },
+ "suggest": {
+ "symfony/expression-language": "",
+ "symfony/security-bundle": ""
+ },
"autoload": {
"psr-0": { "Sensio\\Bundle\\FrameworkExtraBundle": "" }
},
"target-dir": "Sensio/Bundle/FrameworkExtraBundle",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "3.0.x-dev"
}
},
"minimum-stability": "dev"
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateControllerCommand.php b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateControllerCommand.php
index e74660248e..04a6e86a91 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateControllerCommand.php
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateControllerCommand.php
@@ -31,32 +31,10 @@ class GenerateControllerCommand extends GeneratorCommand
{
$this
->setDefinition(array(
- new InputOption(
- 'controller',
- '',
- InputOption::VALUE_REQUIRED,
- 'The name of the controller to create'
- ),
- new InputOption(
- 'route-format',
- '',
- InputOption::VALUE_REQUIRED,
- 'The format that is used for the routing (yml, xml, php, annotation)',
- 'annotation'
- ),
- new InputOption(
- 'template-format',
- '',
- InputOption::VALUE_REQUIRED,
- 'The format that is used for templating (twig, php)',
- 'twig'
- ),
- new InputOption(
- 'actions',
- '',
- InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
- 'The actions in the controller'
- ),
+ new InputOption('controller', '', InputOption::VALUE_REQUIRED, 'The name of the controller to create'),
+ new InputOption('route-format', '', InputOption::VALUE_REQUIRED, 'The format that is used for the routing (yml, xml, php, annotation)', 'annotation'),
+ new InputOption('template-format', '', InputOption::VALUE_REQUIRED, 'The format that is used for templating (twig, php)', 'twig'),
+ new InputOption('actions', '', InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'The actions in the controller'),
))
->setDescription('Generates a controller')
->setHelp(<<setOption('route-format', $routeFormat);
// templating format
- $validateTemplateFormat = function($format) {
+ $validateTemplateFormat = function ($format) {
if (!in_array($format, array('twig', 'php'))) {
throw new \InvalidArgumentException(sprintf('The template format must be twig or php, "%s" given', $format));
}
@@ -212,7 +190,7 @@ EOT
'',
));
- $templateNameValidator = function($name) {
+ $templateNameValidator = function ($name) {
if ('default' == $name) {
return $name;
}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineCommand.php b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineCommand.php
index 3635505aea..11ac15ae38 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineCommand.php
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineCommand.php
@@ -11,7 +11,7 @@
namespace Sensio\Bundle\GeneratorBundle\Command;
-use Doctrine\Bundle\DoctrineBundle\Mapping\MetadataFactory;
+use Doctrine\Bundle\DoctrineBundle\Mapping\DisconnectedMetadataFactory;
abstract class GenerateDoctrineCommand extends GeneratorCommand
{
@@ -33,7 +33,7 @@ abstract class GenerateDoctrineCommand extends GeneratorCommand
protected function getEntityMetadata($entity)
{
- $factory = new MetadataFactory($this->getContainer()->get('doctrine'));
+ $factory = new DisconnectedMetadataFactory($this->getContainer()->get('doctrine'));
return $factory->getClassMetadata($entity)->getMetadata();
}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineFormCommand.php b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineFormCommand.php
index 63219f0dd6..e2567bb230 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineFormCommand.php
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineFormCommand.php
@@ -66,9 +66,8 @@ EOT
$entityClass = $this->getContainer()->get('doctrine')->getAliasNamespace($bundle).'\\'.$entity;
$metadata = $this->getEntityMetadata($entityClass);
$bundle = $this->getApplication()->getKernel()->getBundle($bundle);
+ $generator = $this->getGenerator($bundle);
- $generator = new DoctrineFormGenerator($this->getContainer()->get('filesystem'));
- $generator->setSkeletonDirs($this->getSkeletonDirs($bundle));
$generator->generate($bundle, $entity, $metadata[0]);
$output->writeln(sprintf(
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/ControllerGenerator.php b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/ControllerGenerator.php
index 967f7f73d0..5f3ce2dbee 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/ControllerGenerator.php
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/ControllerGenerator.php
@@ -102,7 +102,7 @@ class ControllerGenerator extends Generator
}
$content .= sprintf(
- "\n%s:\n pattern: %s\n defaults: { _controller: %s }\n",
+ "\n%s:\n path: %s\n defaults: { _controller: %s }\n",
$name,
$action['route'],
$controller
@@ -124,7 +124,7 @@ EOT;
$route = $sxe->addChild('route');
$route->addAttribute('id', $name);
- $route->addAttribute('pattern', $action['route']);
+ $route->addAttribute('path', $action['route']);
$default = $route->addChild('default', $controller);
$default->addAttribute('key', '_controller');
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/DoctrineCrudGenerator.php b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/DoctrineCrudGenerator.php
index 9e282333f2..8258980451 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/DoctrineCrudGenerator.php
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Generator/DoctrineCrudGenerator.php
@@ -202,7 +202,7 @@ class DoctrineCrudGenerator extends Generator
'namespace' => $this->bundle->getNamespace(),
'entity_namespace' => $entityNamespace,
'actions' => $this->actions,
- 'form_type_name' => strtolower(str_replace('\\', '_', $this->bundle->getNamespace()).($parts ? '_' : '').implode('_', $parts).'_'.$entityClass.'Type'),
+ 'form_type_name' => strtolower(str_replace('\\', '_', $this->bundle->getNamespace()).($parts ? '_' : '').implode('_', $parts).'_'.$entityClass),
));
}
@@ -268,6 +268,7 @@ class DoctrineCrudGenerator extends Generator
'route_prefix' => $this->routePrefix,
'route_name_prefix' => $this->routeNamePrefix,
'entity' => $this->entity,
+ 'fields' => $this->metadata->fieldMappings,
'bundle' => $this->bundle->getName(),
'actions' => $this->actions,
));
@@ -280,7 +281,7 @@ class DoctrineCrudGenerator extends Generator
*/
protected function getRecordActions()
{
- return array_filter($this->actions, function($item) {
+ return array_filter($this->actions, function ($item) {
return in_array($item, array('show', 'edit'));
});
}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/LICENSE b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/LICENSE
deleted file mode 100644
index 5f236726af..0000000000
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2013 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_bundle.rst b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_bundle.rst
index 90d04ba4ca..3260006e1b 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_bundle.rst
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_bundle.rst
@@ -59,10 +59,10 @@ Available Options
php app/console generate:bundle --format=annotation
-* ``--structure``: (**no**) [values: yes|no] Whether or not to generate a
+* ``--structure``: If present, generates a
complete default directory structure including empty public folders for
documentation, web assets and translations dictionaries:
.. code-block:: bash
- php app/console generate:bundle --structure=yes
+ php app/console generate:bundle --structure
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_controller.rst b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_controller.rst
index f154f9c4f2..485f33997a 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_controller.rst
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/commands/generate_controller.rst
@@ -27,7 +27,7 @@ Available Options
* ``--controller``: The controller name given as a shortcut notation containing
the bundle name in which the controller is located and the name of the
- bundle. For instance: ``AcmeBlogBundle:Post`` (creates a ``PostController``
+ controller. For instance: ``AcmeBlogBundle:Post`` (creates a ``PostController``
inside the ``AcmeBlogBundle`` bundle):
.. code-block:: bash
@@ -36,7 +36,7 @@ Available Options
* ``--actions``: The list of actions to generate in the controller class. This
has a format like ``%actionname%:%route%:%template`` (where ``:%template%``
- is optional:
+ is optional):
.. code-block:: bash
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/index.rst b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/index.rst
index 77aa74f3e9..efc0b34054 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/index.rst
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/doc/index.rst
@@ -9,7 +9,7 @@ Doctrine 2 schema.
Installation
------------
-`Download`_ the bundle and put it under the ``Sensio\\Bundle\\`` namespace.
+`Download`_ the bundle and put it under the ``Sensio\Bundle`` namespace.
Then, like for any other bundle, include it in your Kernel class::
public function registerBundles()
@@ -68,7 +68,7 @@ about the available templates, their path, and the variables they have access.
Instead of copy/pasting the original template to create your own, you can also
extend it and only override the relevant parts:
-.. code-block: jinja
+.. code-block:: jinja
{# in app/Resources/SensioGeneratorBundle/skeleton/crud/actions/create.php.twig #}
@@ -88,7 +88,7 @@ easy inheritance and to avoid copy/pasting large chunks of code.
In some cases, templates in the skeleton include other ones, like
in the ``crud/views/edit.html.twig.twig`` template for instance:
-.. code-block: jinja
+.. code-block:: jinja
{% include 'crud/views/others/record_actions.html.twig.twig' %}
@@ -96,7 +96,7 @@ If you have defined a custom template for this template, it is going to be
used instead of the default one. But you can explicitly include the original
skeleton template by prefixing its path with ``skeleton/`` like we did above:
-.. code-block: jinja
+.. code-block:: jinja
{% include 'skeleton/crud/views/others/record_actions.html.twig.twig' %}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.xml.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.xml.twig
index 4dd33e3bed..51ab4865dc 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.xml.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.xml.twig
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
{% block body %}
-
+
{{ bundle }}:Default:index
{% endblock body %}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.yml.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.yml.twig
index c8fddb71c5..a4b2224df2 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.yml.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/bundle/routing.yml.twig
@@ -1,3 +1,3 @@
{{ extension_alias }}_homepage:
- pattern: /hello/{name}
+ path: /hello/{name}
defaults: { _controller: {{ bundle }}:Default:index }
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/controller/Controller.php.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/controller/Controller.php.twig
index 6caf83ae9f..0501ba012d 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/controller/Controller.php.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/controller/Controller.php.twig
@@ -31,6 +31,21 @@ class {{ controller }}Controller extends Controller
${{- action.placeholders|join(', $') -}}
{%- endif -%})
{
+ {% if 'annotation' != format.routing -%}
+ {% if 'default' == action.template -%}
+ return $this->render('{{ bundle }}:{{ controller }}:{{ action.name|slice(0, -6) }}.html.{{ format.templating }}', array(
+ // ...
+ ));
+ {%- else -%}
+ return $this->render('{{ action.template }}', array(
+ // ...
+ ));
+ {%- endif %}
+ {%- else -%}
+ return array(
+ // ...
+ );
+ {%- endif %}
}
{% endfor -%}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/create.php.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/create.php.twig
index 7f6118a26b..5c8ee54242 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/create.php.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/create.php.twig
@@ -51,12 +51,12 @@
{% block form %}
/**
- * Creates a form to create a {{ entity }} entity.
- *
- * @param {{ entity_class }} $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to create a {{ entity }} entity.
+ *
+ * @param {{ entity_class }} $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createCreateForm({{ entity_class }} $entity)
{
$form = $this->createForm(new {{ entity_class }}Type(), $entity, array(
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/show.php.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/show.php.twig
index 1e86e20ec5..ad11fc52ef 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/show.php.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/actions/show.php.twig
@@ -43,7 +43,7 @@
'entity' => $entity,
{% if 'delete' in actions %}
'delete_form' => $deleteForm->createView(),
-{%- endif %}
+{% endif %}
));
{% endif %}
{% endblock method_return %}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.xml.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.xml.twig
index f1538a133c..c8b0d4dd23 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.xml.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.xml.twig
@@ -5,38 +5,38 @@
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
{% block body %}
-
+
{{ bundle }}:{{ entity }}:index
-
+
{{ bundle }}:{{ entity }}:show
{% if 'new' in actions %}
-
+
{{ bundle }}:{{ entity }}:new
-
+
{{ bundle }}:{{ entity }}:create
post
{% endif %}
{% if 'edit' in actions %}
-
+
{{ bundle }}:{{ entity }}:edit
-
+
{{ bundle }}:{{ entity }}:update
post|put
{% endif %}
{% if 'delete' in actions %}
-
+
{{ bundle }}:{{ entity }}:delete
post|delete
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.yml.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.yml.twig
index a151b8481c..fc4f446fed 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.yml.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/config/routing.yml.twig
@@ -1,40 +1,40 @@
{% if 'index' in actions %}
{{ route_name_prefix }}:
- pattern: /
+ path: /
defaults: { _controller: "{{ bundle }}:{{ entity }}:index" }
{% endif %}
{% if 'show' in actions %}
{{ route_name_prefix }}_show:
- pattern: /{id}/show
+ path: /{id}/show
defaults: { _controller: "{{ bundle }}:{{ entity }}:show" }
{% endif %}
{% if 'new' in actions %}
{{ route_name_prefix }}_new:
- pattern: /new
+ path: /new
defaults: { _controller: "{{ bundle }}:{{ entity }}:new" }
{{ route_name_prefix }}_create:
- pattern: /create
+ path: /create
defaults: { _controller: "{{ bundle }}:{{ entity }}:create" }
requirements: { _method: post }
{% endif %}
{% if 'edit' in actions %}
{{ route_name_prefix }}_edit:
- pattern: /{id}/edit
+ path: /{id}/edit
defaults: { _controller: "{{ bundle }}:{{ entity }}:edit" }
{{ route_name_prefix }}_update:
- pattern: /{id}/update
+ path: /{id}/update
defaults: { _controller: "{{ bundle }}:{{ entity }}:update" }
requirements: { _method: post|put }
{% endif %}
{% if 'delete' in actions %}
{{ route_name_prefix }}_delete:
- pattern: /{id}/delete
+ path: /{id}/delete
defaults: { _controller: "{{ bundle }}:{{ entity }}:delete" }
requirements: { _method: post|delete }
{% endif %}
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/tests/others/full_scenario.php.twig b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/tests/others/full_scenario.php.twig
index 56c5ad7ef0..1412443d8b 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/tests/others/full_scenario.php.twig
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Resources/skeleton/crud/tests/others/full_scenario.php.twig
@@ -24,7 +24,7 @@
// Edit the entity
$crawler = $client->click($crawler->selectLink('Edit')->link());
- $form = $crawler->selectButton('Edit')->form(array(
+ $form = $crawler->selectButton('Update')->form(array(
'{{ form_type_name|lower }}[field_name]' => 'Foo',
// ... other fields to fill
));
diff --git a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/ControllerGeneratorTest.php b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/ControllerGeneratorTest.php
index b69b3a3e7f..44a4de637f 100644
--- a/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/ControllerGeneratorTest.php
+++ b/vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/Tests/Generator/ControllerGeneratorTest.php
@@ -77,6 +77,7 @@ class ControllerGeneratorTest extends GeneratorTest
'public function getListOfPagesAction($max_count)',
'@Template()',
'@Template("FooBarBundle:Page:pages_list.html.twig")',
+ 'return array(',
);
foreach ($strings as $string) {
$this->assertContains($string, $content);
@@ -107,11 +108,13 @@ class ControllerGeneratorTest extends GeneratorTest
$content = file_get_contents($this->tmpDir.'/Controller/PageController.php');
$this->assertNotContains('@Route()', $content, 'Routing is done via a yml file');
+ $this->assertContains("return \$this->render('FooBarBundle:Page:showPage.html.php', array(", $content, 'Controller renders template');
+
$content = file_get_contents($this->tmpDir.'/Resources/views/Page/showPage.html.php');
$this->assertContains($this->getBundle()->getName().':Page:showPage', $content);
$content = file_get_contents($this->tmpDir.'/Resources/config/routing.yml');
- $this->assertContains("show_page:\n pattern: /{slug}\n defaults: { _controller: FooBarBundle:Page:showPage }", $content);
+ $this->assertContains("show_page:\n path: /{slug}\n defaults: { _controller: FooBarBundle:Page:showPage }", $content);
}
protected function getGenerator()
diff --git a/web/install.php b/web/install.php
new file mode 100644
index 0000000000..8410e45df3
--- /dev/null
+++ b/web/install.php
@@ -0,0 +1,16 @@
+handle($request)->send();
+} else {
+ header('Location: ' . $request->getBaseUrl() . '/../app.php');
+}