- ").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var n=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(r){r.target!==t.element[0]&&r.target!==n&&!e.contains(n,r.target)&&t.close()})})},menufocus:function(t,n){var r,i;if(this.isNewMenu){this.isNewMenu=!1;if(t.originalEvent&&/^mouse/.test(t.originalEvent.type)){this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)});return}}i=n.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:i})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(i.value),r=n.item.attr("aria-label")||i.value,r&&e.trim(r).length&&(this.liveRegion.children().hide(),e("
- ",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(s.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:s.optgroup}).appendTo(t),i=s.optgroup),r._renderItemData(t,s)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,n){var r=e("
- ");return n.disabled&&r.addClass("ui-state-disabled"),this._setText(r,n.label),r.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html(" ")},_move:function(e,t){var n,r,i=".ui-menu-item";this.isOpen?n=this.menuItems.eq(this.focusIndex):(n=this.menuItems.eq(this.element[0].selectedIndex),i+=":not(.ui-state-disabled)"),e==="first"||e==="last"?r=n[e==="first"?"prevAll":"nextAll"](i).eq(-1):r=n[e+"All"](i).eq(0),r.length&&this.menuInstance.focus(t,r)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_setSelection:function(){var e;if(!this.range)return;window.getSelection?(e=window.getSelection(),e.removeAllRanges(),e.addRange(this.range)):this.range.select(),this.button.focus()},_documentClick:{mousedown:function(t){if(!this.isOpen)return;e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t)}},_buttonEvents:{mousedown:function(){var e;window.getSelection?(e=window.getSelection(),e.rangeCount&&(this.range=e.getRangeAt(0))):this.range=document.selection.createRange()},click:function(e){this._setSelection(),this._toggle(e)},keydown:function(t){var n=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),n=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),n=!1}n&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var n=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==n&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){e==="icons"&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),e==="appendTo"&&this.menuWrap.appendTo(this._appendTo()),e==="disabled"&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),e==="width"&&this._resizeButton()},_appendTo:function(){var t=this.options.appendTo;t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0));if(!t||!t[0])t=this.element.closest(".ui-front");return t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var e=this.options.width;e||(e=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(e)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var n=[];t.each(function(t,r){var i=e(r),s=i.parent("optgroup");n.push({element:i,index:t,value:i.val(),label:i.text(),optgroup:s.attr("label")||"",disabled:s.prop("disabled")||i.prop("disabled")})}),this.items=n},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}})});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/slider-min.js b/core/assets/vendor/jquery.ui/ui/slider-min.js
deleted file mode 100644
index 087252d56..000000000
--- a/core/assets/vendor/jquery.ui/ui/slider-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Slider 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/slider/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./mouse","./widget"],e):e(jQuery)})(function(e){return e.widget("ui.slider",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,n,r=this.options,i=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),s="",o=[];n=r.values&&r.values.length||1,i.length>n&&(i.slice(n).remove(),i=i.slice(0,n));for(t=i.length;t
").text(r).appendTo(this.liveRegion))},menuselect:function(e,t){var n=t.item.data("ui-autocomplete-item"),r=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=r,this._delay(function(){this.previous=r,this.selectedItem=n})),!1!==this._trigger("select",e,{item:n})&&this._value(n.value),this.term=this._value(),this.close(e),this.selectedItem=n}}),this.liveRegion=e("",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),e==="source"&&this._initSource(),e==="appendTo"&&this.menu.element.appendTo(this._appendTo()),e==="disabled"&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0));if(!t||!t[0])t=this.element.closest(".ui-front");return t.length||(t=this.document[0].body),t},_initSource:function(){var t,n,r=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(n,r){r(e.ui.autocomplete.filter(t,n.term))}):typeof this.options.source=="string"?(n=this.options.source,this.source=function(t,i){r.xhr&&r.xhr.abort(),r.xhr=e.ajax({url:n,data:t,dataType:"json",success:function(e){i(e)},error:function(){i([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),n=this.menu.element.is(":visible"),r=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;if(!t||t&&!n&&!r)this.selectedItem=null,this.search(null,e)},this.options.delay)},search:function(e,t){e=e!=null?e:this._value(),this.term=this._value();if(e.length").text(n.label).appendTo(t)},_move:function(e,t){if(!this.menu.element.is(":visible")){this.search(null,t);return}if(this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)){this.isMultiLine||this._value(this.term),this.menu.blur();return}this.menu[e](t)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){if(!this.isMultiLine||this.menu.element.is(":visible"))this._move(e,t),t.preventDefault()}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,n){var r=new RegExp(e.ui.autocomplete.escapeRegex(n),"i");return e.grep(t,function(e){return r.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var n;this._superApply(arguments);if(this.options.disabled||this.cancelSearch)return;t&&t.length?n=this.options.messages.results(t.length):n=this.options.messages.noResults,this.liveRegion.children().hide(),e("r?r:i},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return t==null?[1,1]:typeof t=="number"?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return(new Date(e,t,1)).getDay()},_canAdjustMonth:function(e,t,n,r){var i=this._getNumberOfMonths(e),s=this._daylightSavingAdjust(new Date(n,r+(t<0?t:i[0]*i[1]),1));return t<0&&s.setDate(this._getDaysInMonth(s.getFullYear(),s.getMonth())),this._isInRange(e,s)},_isInRange:function(e,t){var n,r,i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),o=null,u=null,a=this._get(e,"yearRange");return a&&(n=a.split(":"),r=(new Date).getFullYear(),o=parseInt(n[0],10),u=parseInt(n[1],10),n[0].match(/[+\-].*/)&&(o+=r),n[1].match(/[+\-].*/)&&(u+=r)),(!i||t.getTime()>=i.getTime())&&(!s||t.getTime()<=s.getTime())&&(!o||t.getFullYear()>=o)&&(!u||t.getFullYear()<=u)},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t=typeof t!="string"?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,n,r){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var i=t?typeof t=="object"?t:this._daylightSavingAdjust(new Date(r,n,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),i,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),e("#"+e.datepicker._mainDivId).length===0&&e("body").append(e.datepicker.dpDiv);var n=Array.prototype.slice.call(arguments,1);return typeof t!="string"||t!=="isDisabled"&&t!=="getDate"&&t!=="widget"?t==="option"&&arguments.length===2&&typeof arguments[1]=="string"?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(n)):this.each(function(){typeof t=="string"?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(n)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(n))},e.datepicker=new r,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.4",e.datepicker});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/dialog-min.js b/core/assets/vendor/jquery.ui/ui/dialog-min.js
deleted file mode 100644
index 0feb5b7c5..000000000
--- a/core/assets/vendor/jquery.ui/ui/dialog-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Dialog 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/dialog/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./widget","./button","./draggable","./mouse","./position","./resizable"],e):e(jQuery)})(function(e){return e.widget("ui.dialog",{version:"1.11.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var n=e(this).css(t).offset().top;n<0&&e(this).css("top",t.top-n)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var n,r=this;if(!this._isOpen||this._trigger("beforeClose",t)===!1)return;this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance();if(!this.opener.filter(":focusable").focus().length)try{n=this.document[0].activeElement,n&&n.nodeName.toLowerCase()!=="body"&&e(n).blur()}catch(i){}this._hide(this.uiDialog,this.options.hide,function(){r._trigger("close",t)})},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,n){var r=!1,i=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),s=Math.max.apply(null,i);return s>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",s+1),r=!0),r&&!n&&this._trigger("focus",t),r},open:function(){var t=this;if(this._isOpen){this._moveToTop()&&this._focusTabbable();return}this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open")},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function n(){var t=this.document[0].activeElement,n=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);n||this._focusTabbable()}t.preventDefault(),n.call(this),this._delay(n)},_createWrapper:function(){this.uiDialog=e("
").text(n).appendTo(this.liveRegion)}}),e.ui.autocomplete});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/button-min.js b/core/assets/vendor/jquery.ui/ui/button-min.js
deleted file mode 100644
index 3e540ffab..000000000
--- a/core/assets/vendor/jquery.ui/ui/button-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Button 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/button/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./widget"],e):e(jQuery)})(function(e){var t,n="ui-button ui-widget ui-state-default ui-corner-all",r="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",i=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},s=function(t){var n=t.name,r=t.form,i=e([]);return n&&(n=n.replace(/'/g,"\\'"),r?i=e(r).find("[name='"+n+"'][type=radio]"):i=e("[name='"+n+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),i};return e.widget("ui.button",{version:"1.11.4",defaultElement:"
"+(V[0]>0&&T===V[1]-1?"":""):""),x+=k}w+=x}return w+=f,e._keyEvent=!1,w},_generateMonthYearHeader:function(e,t,n,r,i,s,o,u){var a,f,l,c,h,p,d,v,m=this._get(e,"changeMonth"),g=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="",w="";if(s||!m)w+=""+o[t]+"";else{a=r&&r.getFullYear()===n,f=i&&i.getFullYear()===n,w+=""}y||(b+=w+(s||!m||!g?" ":""));if(!e.yearshtml){e.yearshtml="";if(s||!g)b+=""+
-n+"";else{c=this._get(e,"yearRange").split(":"),h=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?n+parseInt(e.substring(1),10):e.match(/[+\-].*/)?h+parseInt(e,10):parseInt(e,10);return isNaN(t)?h:t},d=p(c[0]),v=Math.max(d,p(c[1]||"")),d=r?Math.max(d,r.getFullYear()):d,v=i?Math.min(v,i.getFullYear()):v,e.yearshtml+="",b+=e.yearshtml,e.yearshtml=null}}return b+=this._get(e,"yearSuffix"),y&&(b+=(s||!m||!g?" ":"")+w),b+="
",b},_adjustInstDate:function(e,t,n){var r=e.drawYear+(n==="Y"?t:0),i=e.drawMonth+(n==="M"?t:0),s=Math.min(e.selectedDay,this._getDaysInMonth(r,i))+(n==="D"?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(r,i,s)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),(n==="M"||n==="Y")&&this._notifyChange(e)},_restrictMinMax:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max"),i=n&&t").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE){t.preventDefault(),this.close(t);return}if(t.keyCode!==e.ui.keyCode.TAB||t.isDefaultPrevented())return;var n=this.uiDialog.find(":tabbable"),r=n.filter(":first"),i=n.filter(":last");t.target!==i[0]&&t.target!==this.uiDialog[0]||!!t.shiftKey?(t.target===r[0]||t.target===this.uiDialog[0])&&t.shiftKey&&(this._delay(function(){i.focus()}),t.preventDefault()):(this._delay(function(){r.focus()}),t.preventDefault())},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("
").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html(" "),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("
").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("
").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,n=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty();if(e.isEmptyObject(n)||e.isArray(n)&&!n.length){this.uiDialog.removeClass("ui-dialog-buttons");return}e.each(n,function(n,r){var i,s;r=e.isFunction(r)?{click:r,text:n}:r,r=e.extend({type:"button"},r),i=r.click,r.click=function(){i.apply(t.element[0],arguments)},s={icons:r.icons,text:r.showText},delete r.icons,delete r.showText,e("",r).button(s).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)},_makeDraggable:function(){function r(e){return{position:e.position,offset:e.offset}}var t=this,n=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(n,i){e(this).addClass("ui-dialog-dragging"),t._blockFrames(),t._trigger("dragStart",n,r(i))},drag:function(e,n){t._trigger("drag",e,r(n))},stop:function(i,s){var o=s.offset.left-t.document.scrollLeft(),u=s.offset.top-t.document.scrollTop();n.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(u>=0?"+":"")+u,of:t.window},e(this).removeClass("ui-dialog-dragging"),t._unblockFrames(),t._trigger("dragStop",i,r(s))}})},_makeResizable:function(){function o(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var t=this,n=this.options,r=n.resizable,i=this.uiDialog.css("position"),s=typeof r=="string"?r:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:n.maxWidth,maxHeight:n.maxHeight,minWidth:n.minWidth,minHeight:this._minHeight(),handles:s,start:function(n,r){e(this).addClass("ui-dialog-resizing"),t._blockFrames(),t._trigger("resizeStart",n,o(r))},resize:function(e,n){t._trigger("resize",e,o(n))},stop:function(r,i){var s=t.uiDialog.offset(),u=s.left-t.document.scrollLeft(),a=s.top-t.document.scrollTop();n.height=t.uiDialog.height(),n.width=t.uiDialog.width(),n.position={my:"left top",at:"left"+(u>=0?"+":"")+u+" "+"top"+(a>=0?"+":"")+a,of:t.window},e(this).removeClass("ui-dialog-resizing"),t._unblockFrames(),t._trigger("resizeStop",r,o(i))}}).css("position",i)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),n=e.inArray(this,t);n!==-1&&t.splice(n,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return e.height==="auto"?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var n=this,r=!1,i={};e.each(t,function(e,t){n._setOption(e,t),e in n.sizeRelatedOptions&&(r=!0),e in n.resizableRelatedOptions&&(i[e]=t)}),r&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",i)},_setOption:function(e,t){var n,r,i=this.uiDialog;e==="dialogClass"&&i.removeClass(this.options.dialogClass).addClass(t);if(e==="disabled")return;this._super(e,t),e==="appendTo"&&this.uiDialog.appendTo(this._appendTo()),e==="buttons"&&this._createButtons(),e==="closeText"&&this.uiDialogTitlebarClose.button({label:""+t}),e==="draggable"&&(n=i.is(":data(ui-draggable)"),n&&!t&&i.draggable("destroy"),!n&&t&&this._makeDraggable()),e==="position"&&this._position(),e==="resizable"&&(r=i.is(":data(ui-resizable)"),r&&!t&&i.resizable("destroy"),r&&typeof t=="string"&&i.resizable("option","handles",t),!r&&t!==!1&&this._makeResizable()),e==="title"&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title"))},_size:function(){var e,t,n,r=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),r.minWidth>r.width&&(r.width=r.minWidth),e=this.uiDialog.css({height:"auto",width:r.width}).outerHeight(),t=Math.max(0,r.minHeight-e),n=typeof r.maxHeight=="number"?Math.max(0,r.maxHeight-e):"none",r.height==="auto"?this.element.css({minHeight:t,maxHeight:n,height:"auto"}):this.element.height(Math.max(0,r.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("p,y=r.minHeight&&r.minHeight>d;r.grid=a,g&&(p+=f),y&&(d+=l),v&&(p-=f),m&&(d-=l);if(/^(se|s|e)$/.test(u))n.size.width=p,n.size.height=d;else if(/^(ne)$/.test(u))n.size.width=p,n.size.height=d,n.position.top=o.top-h;else if(/^(sw)$/.test(u))n.size.width=p,n.size.height=d,n.position.left=o.left-c;else{if(d-l<=0||p-f<=0)t=n._getPaddingPlusBorderDimensions(this);d-l>0?(n.size.height=d,n.position.top=o.top-h):(d=l-t.height,n.size.height=d,n.position.top=o.top+s.height-d),p-f>0?(n.size.width=p,n.position.left=o.left-c):(p=f-t.width,n.size.width=p,n.position.left=o.left+s.width-p)}}}),e.ui.resizable});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/selectable-min.js b/core/assets/vendor/jquery.ui/ui/selectable-min.js
deleted file mode 100644
index dd08ef28d..000000000
--- a/core/assets/vendor/jquery.ui/ui/selectable-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Selectable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/selectable/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./mouse","./widget"],e):e(jQuery)})(function(e){return e.widget("ui.selectable",e.ui.mouse,{version:"1.11.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,n=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(n.options.filter,n.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),n=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:n.left,top:n.top,right:n.left+t.outerWidth(),bottom:n.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var n=this,r=this.options;this.opos=[t.pageX,t.pageY];if(this.options.disabled)return;this.selectees=e(r.filter,this.element[0]),this._trigger("start",t),e(r.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),r.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var r=e.data(this,"selectable-item");r.startselected=!0,!t.metaKey&&!t.ctrlKey&&(r.$element.removeClass("ui-selected"),r.selected=!1,r.$element.addClass("ui-unselecting"),r.unselecting=!0,n._trigger("unselecting",t,{unselecting:r.element}))}),e(t.target).parents().addBack().each(function(){var r,i=e.data(this,"selectable-item");if(i)return r=!t.metaKey&&!t.ctrlKey||!i.$element.hasClass("ui-selected"),i.$element.removeClass(r?"ui-unselecting":"ui-selected").addClass(r?"ui-selecting":"ui-unselecting"),i.unselecting=!r,i.selecting=r,i.selected=r,r?n._trigger("selecting",t,{selecting:i.element}):n._trigger("unselecting",t,{unselecting:i.element}),!1})},_mouseDrag:function(t){this.dragged=!0;if(this.options.disabled)return;var n,r=this,i=this.options,s=this.opos[0],o=this.opos[1],u=t.pageX,a=t.pageY;return s>u&&(n=u,u=s,s=n),o>a&&(n=a,a=o,o=n),this.helper.css({left:s,top:o,width:u-s,height:a-o}),this.selectees.each(function(){var n=e.data(this,"selectable-item"),f=!1;if(!n||n.element===r.element[0])return;i.tolerance==="touch"?f=!(n.left>u||n.righta||n.bottoms&&n.righto&&n.bottom",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this;this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("
").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(!this.options.modal)return;var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){if(t)return;this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,u=this.originalPosition.left+this.originalSize.width,a=this.position.top+this.size.height,f=/sw|nw|w/.test(n),l=/nw|ne|n/.test(n);return s&&(e.width=t.minWidth),o&&(e.height=t.minHeight),r&&(e.width=t.maxWidth),i&&(e.height=t.maxHeight),s&&f&&(e.left=u-t.minWidth),r&&f&&(e.left=u-t.maxWidth),o&&l&&(e.top=a-t.minHeight),i&&l&&(e.top=a-t.maxHeight),!e.width&&!e.height&&!e.left&&e.top?e.top=null:!e.width&&!e.height&&!e.top&&e.left&&(e.left=null),e},_getPaddingPlusBorderDimensions:function(e){var t=0,n=[],r=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],i=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];for(;t<4;t++)n[t]=parseInt(r[t],10)||0,n[t]+=parseInt(i[t],10)||0;return{height:n[0]+n[2],width:n[1]+n[3]}},_proportionallyResize:function(){if(!this._proportionallyResizeElements.length)return;var e,t=0,n=this.helper||this.element;for(;t
"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++n.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var n=this.originalSize,r=this.originalPosition;return{left:r.left+t,width:n.width-t}},n:function(e,t,n){var r=this.originalSize,i=this.originalPosition;return{top:i.top+n,height:r.height-n}},s:function(e,t,n){return{height:this.originalSize.height+n}},se:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},sw:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,n,r]))},ne:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},nw:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,n,r]))}},_propagate:function(t,n){e.ui.plugin.call(this,t,[n,this.ui()]),t!=="resize"&&this._trigger(t,n,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var n=e(this).resizable("instance"),r=n.options,i=n._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),o=s&&n._hasScroll(i[0],"left")?0:n.sizeDiff.height,u=s?0:n.sizeDiff.width,a={width:n.size.width-u,height:n.size.height-o},f=parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left)||null,l=parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top)||null;n.element.animate(e.extend(a,l&&f?{top:l,left:f}:{}),{duration:r.animateDuration,easing:r.animateEasing,step:function(){var r={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};i&&i.length&&e(i[0]).css({width:r.width,height:r.height}),n._updateCache(r),n._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,n,r,i,s,o,u,a=e(this).resizable("instance"),f=a.options,l=a.element,c=f.containment,h=c instanceof e?c.get(0):/parent/.test(c)?l.parent().get(0):c;if(!h)return;a.containerElement=e(h),/document/.test(c)||c===document?(a.containerOffset={left:0,top:0},a.containerPosition={left:0,top:0},a.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(h),n=[],e(["Top","Right","Left","Bottom"]).each(function(e,r){n[e]=a._num(t.css("padding"+r))}),a.containerOffset=t.offset(),a.containerPosition=t.position(),a.containerSize={height:t.innerHeight()-n[3],width:t.innerWidth()-n[1]},r=a.containerOffset,i=a.containerSize.height,s=a.containerSize.width,o=a._hasScroll(h,"left")?h.scrollWidth:s,u=a._hasScroll(h)?h.scrollHeight:i,a.parentData={element:h,left:r.left,top:r.top,width:o,height:u})},resize:function(t){var n,r,i,s,o=e(this).resizable("instance"),u=o.options,a=o.containerOffset,f=o.position,l=o._aspectRatio||t.shiftKey,c={top:0,left:0},h=o.containerElement,p=!0;h[0]!==document&&/static/.test(h.css("position"))&&(c=a),f.left<(o._helper?a.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-a.left:o.position.left-c.left),l&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=u.helper?a.left:0),f.top<(o._helper?a.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-a.top:o.position.top),l&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?a.top:0),i=o.containerElement.get(0)===o.element.parent().get(0),s=/relative|absolute/.test(o.containerElement.css("position")),i&&s?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),n=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-c.left:o.offset.left-a.left)),r=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-c.top:o.offset.top-a.top)),n+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-n,l&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),r+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-r,l&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),n=t.options,r=t.containerOffset,i=t.containerPosition,s=t.containerElement,o=e(t.helper),u=o.offset(),a=o.outerWidth()-t.sizeDiff.width,f=o.outerHeight()-t.sizeDiff.height;t._helper&&!n.animate&&/relative/.test(s.css("position"))&&e(this).css({left:u.left-i.left-r.left,width:a,height:f}),t._helper&&!n.animate&&/static/.test(s.css("position"))&&e(this).css({left:u.left-i.left-r.left,width:a,height:f})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),n=t.options;e(n.alsoResize).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})},resize:function(t,n){var r=e(this).resizable("instance"),i=r.options,s=r.originalSize,o=r.originalPosition,u={height:r.size.height-s.height||0,width:r.size.width-s.width||0,top:r.position.top-o.top||0,left:r.position.left-o.left||0};e(i.alsoResize).each(function(){var t=e(this),r=e(this).data("ui-resizable-alsoresize"),i={},s=t.parents(n.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(s,function(e,t){var n=(r[t]||0)+(u[t]||0);n&&n>=0&&(i[t]=n||null)}),t.css(i)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),n=t.options,r=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:r.height,width:r.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof n.ghost=="string"?n.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,n=e(this).resizable("instance"),r=n.options,i=n.size,s=n.originalSize,o=n.originalPosition,u=n.axis,a=typeof r.grid=="number"?[r.grid,r.grid]:r.grid,f=a[0]||1,l=a[1]||1,c=Math.round((i.width-s.width)/f)*f,h=Math.round((i.height-s.height)/l)*l,p=s.width+c,d=s.height+h,v=r.maxWidth&&r.maxWidth").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)},_destroyOverlay:function(){if(!this.options.modal)return;if(this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}})});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/draggable-min.js b/core/assets/vendor/jquery.ui/ui/draggable-min.js
deleted file mode 100644
index 70e68089e..000000000
--- a/core/assets/vendor/jquery.ui/ui/draggable-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Draggable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/draggable/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./mouse","./widget"],e):e(jQuery)})(function(e){return e.widget("ui.draggable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){this.options.helper==="original"&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),e==="handle"&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){if((this.helper||this.element).is(".ui-draggable-dragging")){this.destroyOnClear=!0;return}this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy()},_mouseCapture:function(t){var n=this.options;return this._blurActiveElement(t),this.helper||n.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(n.iframeFix===!0?"iframe":n.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("1&&c.splice.apply(c,[1,0].concat(c.splice(h,a+1))),r.dequeue()}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-scale-min.js b/core/assets/vendor/jquery.ui/ui/effect-scale-min.js
deleted file mode 100644
index a7cadb289..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-scale-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Scale 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/scale-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect","./effect-size"],e):e(jQuery)})(function(e){return e.effects.effect.scale=function(t,n){var r=e(this),i=e.extend(!0,{},t),s=e.effects.setMode(r,t.mode||"effect"),o=parseInt(t.percent,10)||(parseInt(t.percent,10)===0?0:s==="hide"?0:100),u=t.direction||"both",a=t.origin,f={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()},l={y:u!=="horizontal"?o/100:1,x:u!=="vertical"?o/100:1};i.effect="size",i.queue=!1,i.complete=n,s!=="effect"&&(i.origin=a||["middle","center"],i.restore=!0),i.from=t.from||(s==="show"?{height:0,width:0,outerHeight:0,outerWidth:0}:f),i.to={height:f.height*l.y,width:f.width*l.x,outerHeight:f.outerHeight*l.y,outerWidth:f.outerWidth*l.x},i.fade&&(s==="show"&&(i.from.opacity=0,i.to.opacity=1),s==="hide"&&(i.from.opacity=1,i.to.opacity=0)),r.effect(i)}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-shake-min.js b/core/assets/vendor/jquery.ui/ui/effect-shake-min.js
deleted file mode 100644
index 06055aa2c..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-shake-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Shake 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/shake-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.shake=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=t.direction||"left",u=t.distance||20,a=t.times||3,f=a*2+1,l=Math.round(t.duration/f),c=o==="up"||o==="down"?"top":"left",h=o==="up"||o==="left",p={},d={},v={},m,g=r.queue(),y=g.length;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),p[c]=(h?"-=":"+=")+u,d[c]=(h?"+=":"-=")+u*2,v[c]=(h?"-=":"+=")+u*2,r.animate(p,l,t.easing);for(m=1;m1&&g.splice.apply(g,[1,0].concat(g.splice(y,f+1))),r.dequeue()}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-size-min.js b/core/assets/vendor/jquery.ui/ui/effect-size-min.js
deleted file mode 100644
index cd7467e61..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-size-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Size 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/size-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.size=function(t,n){var r,i,s,o=e(this),u=["position","top","bottom","left","right","width","height","overflow","opacity"],a=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],l=["fontSize"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),d=t.restore||p!=="effect",v=t.scale||"both",m=t.origin||["middle","center"],g=o.css("position"),y=d?u:a,b={height:0,width:0,outerHeight:0,outerWidth:0};p==="show"&&o.show(),r={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},t.mode==="toggle"&&p==="show"?(o.from=t.to||b,o.to=t.from||r):(o.from=t.from||(p==="show"?b:r),o.to=t.to||(p==="hide"?b:r)),s={from:{y:o.from.height/r.height,x:o.from.width/r.width},to:{y:o.to.height/r.height,x:o.to.width/r.width}};if(v==="box"||v==="both")s.from.y!==s.to.y&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,s.from.y,o.from),o.to=e.effects.setTransition(o,c,s.to.y,o.to)),s.from.x!==s.to.x&&(y=y.concat(h),o.from=e.effects.setTransition(o,h,s.from.x,o.from),o.to=e.effects.setTransition(o,h,s.to.x,o.to));(v==="content"||v==="both")&&s.from.y!==s.to.y&&(y=y.concat(l).concat(f),o.from=e.effects.setTransition(o,l,s.from.y,o.from),o.to=e.effects.setTransition(o,l,s.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),m&&(i=e.effects.getBaseline(m,r),o.from.top=(r.outerHeight-o.outerHeight())*i.y,o.from.left=(r.outerWidth-o.outerWidth())*i.x,o.to.top=(r.outerHeight-o.to.outerHeight)*i.y,o.to.left=(r.outerWidth-o.to.outerWidth)*i.x),o.css(o.from);if(v==="content"||v==="both")c=c.concat(["marginTop","marginBottom"]).concat(l),h=h.concat(["marginLeft","marginRight"]),f=u.concat(c).concat(h),o.find("*[width]").each(function(){var n=e(this),r={height:n.height(),width:n.width(),outerHeight:n.outerHeight(),outerWidth:n.outerWidth()};d&&e.effects.save(n,f),n.from={height:r.height*s.from.y,width:r.width*s.from.x,outerHeight:r.outerHeight*s.from.y,outerWidth:r.outerWidth*s.from.x},n.to={height:r.height*s.to.y,width:r.width*s.to.x,outerHeight:r.height*s.to.y,outerWidth:r.width*s.to.x},s.from.y!==s.to.y&&(n.from=e.effects.setTransition(n,c,s.from.y,n.from),n.to=e.effects.setTransition(n,c,s.to.y,n.to)),s.from.x!==s.to.x&&(n.from=e.effects.setTransition(n,h,s.from.x,n.from),n.to=e.effects.setTransition(n,h,s.to.x,n.to)),n.css(n.from),n.animate(n.to,t.duration,t.easing,function(){d&&e.effects.restore(n,f)})});o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o.to.opacity===0&&o.css("opacity",o.from.opacity),p==="hide"&&o.hide(),e.effects.restore(o,y),d||(g==="static"?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,n){var r=parseInt(n,10),i=e?o.to.left:o.to.top;return n==="auto"?i+"px":r+i+"px"})})),e.effects.removeWrapper(o),n()}})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-slide-min.js b/core/assets/vendor/jquery.ui/ui/effect-slide-min.js
deleted file mode 100644
index d75588a57..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-slide-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Slide 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/slide-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.slide=function(t,n){var r=e(this),i=["position","top","bottom","left","right","width","height"],s=e.effects.setMode(r,t.mode||"show"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left",l,c={};e.effects.save(r,i),r.show(),l=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(r).css({overflow:"hidden"}),o&&r.css(a,f?isNaN(l)?"-"+l:-l:l),c[a]=(o?f?"+=":"-=":f?"-=":"+=")+l,r.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-transfer-min.js b/core/assets/vendor/jquery.ui/ui/effect-transfer-min.js
deleted file mode 100644
index f61ea3e8a..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-transfer-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Transfer 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/transfer-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.transfer=function(t,n){var r=e(this),i=e(t.to),s=i.css("position")==="fixed",o=e("body"),u=s?o.scrollTop():0,a=s?o.scrollLeft():0,f=i.offset(),l={top:f.top-u,left:f.left-a,height:i.innerHeight(),width:i.innerWidth()},c=r.offset(),h=e("").appendTo(document.body).addClass(t.className).css({top:c.top-u,left:c.left-a,height:r.innerHeight(),width:r.innerWidth(),position:s?"fixed":"absolute"}).animate(l,t.duration,t.easing,function(){h.remove(),n()})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/menu-min.js b/core/assets/vendor/jquery.ui/ui/menu-min.js
deleted file mode 100644
index 502889dda..000000000
--- a/core/assets/vendor/jquery.ui/ui/menu-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Menu 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/menu/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./widget","./position"],e):e(jQuery)})(function(e){return e.widget("ui.menu",{version:"1.11.4",defaultElement:"
"),i.css({zIndex:u.zIndex}),"se"===r&&i.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[r]=".ui-resizable-"+r,this.element.append(i)}this._renderAxis=function(t){var n,r,i,s;t=t||this.element;for(n in this.handles){if(this.handles[n].constructor===String)this.handles[n]=this.element.children(this.handles[n]).first().show();else if(this.handles[n].jquery||this.handles[n].nodeType)this.handles[n]=e(this.handles[n]),this._on(this.handles[n],{mousedown:o._mouseDown});this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(r=e(this.handles[n],this.element),s=/sw|ne|nw|se|n|s/.test(n)?r.outerHeight():r.outerWidth(),i=["padding",/ne|nw|n/.test(n)?"Top":/se|sw|s/.test(n)?"Bottom":/^e$/.test(n)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize()),this._handles=this._handles.add(this.handles[n])}},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=i&&i[1]?i[1]:"se")}),u.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){if(u.disabled)return;e(this).removeClass("ui-resizable-autohide"),o._handles.show()}).mouseleave(function(){if(u.disabled)return;o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,n=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(n(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),n(this.originalElement),this},_mouseCapture:function(t){var n,r,i=!1;for(n in this.handles){r=e(this.handles[n])[0];if(r===t.target||e.contains(r,t.target))i=!0}return!this.options.disabled&&i},_mouseStart:function(t){var n,r,i,s=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),n=this._num(this.helper.css("left")),r=this._num(this.helper.css("top")),s.containment&&(n+=e(s.containment).scrollLeft()||0,r+=e(s.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:n,top:r},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:n,top:r},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio=typeof s.aspectRatio=="number"?s.aspectRatio:this.originalSize.width/this.originalSize.height||1,i=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor",i==="auto"?this.axis+"-resize":i),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var n,r,i=this.originalMousePosition,s=this.axis,o=t.pageX-i.left||0,u=t.pageY-i.top||0,a=this._change[s];this._updatePrevProperties();if(!a)return!1;n=a.apply(this,[t,o,u]),this._updateVirtualBoundaries(t.shiftKey);if(this._aspectRatio||t.shiftKey)n=this._updateRatio(n,t);return n=this._respectSize(n,t),this._updateCache(n),this._propagate("resize",t),r=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(r)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1},_mouseStop:function(t){this.resizing=!1;var n,r,i,s,o,u,a,f=this.options,l=this;return this._helper&&(n=this._proportionallyResizeElements,r=n.length&&/textarea/i.test(n[0].nodeName),i=r&&this._hasScroll(n[0],"left")?0:l.sizeDiff.height,s=r?0:l.sizeDiff.width,o={width:l.helper.width()-s,height:l.helper.height()-i},u=parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left)||null,a=parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top)||null,f.animate||this.element.css(e.extend(o,{top:a,left:u})),l.helper.height(l.size.height),l.helper.width(l.size.width),this._helper&&!f.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,n,r,i,s,o=this.options;s={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:Infinity,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:Infinity};if(this._aspectRatio||e)t=s.minHeight*this.aspectRatio,r=s.minWidth/this.aspectRatio,n=s.maxHeight*this.aspectRatio,i=s.maxWidth/this.aspectRatio,t>s.minWidth&&(s.minWidth=t),r>s.minHeight&&(s.minHeight=r),n").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var n=this.document[0];if(!this.handleElement.is(t.target))return;try{n.activeElement&&n.activeElement.nodeName.toLowerCase()!=="body"&&e(n.activeElement).blur()}catch(r){}},_mouseStart:function(t){var n=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return e(this).css("position")==="fixed"}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,n.cursorAt&&this._adjustOffsetFromHelper(n.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,n){this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute");if(!n){var r=this._uiHash();if(this._trigger("drag",t,r)===!1)return this._mouseUp({}),!1;this.position=r.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var n=this,r=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(r=e.ui.ddmanager.drop(this,t)),this.dropped&&(r=this.dropped,this.dropped=!1),this.options.revert==="invalid"&&!r||this.options.revert==="valid"&&r||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,r)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){n._trigger("stop",t)!==!1&&n._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper),i=r?e(n.helper.apply(this.element[0],[t])):n.helper==="clone"?this.element.clone().removeAttr("id"):this.element;return i.parents("body").length||i.appendTo(n.appendTo==="parent"?this.element[0].parentNode:n.appendTo),r&&i[0]===this.element[0]&&this._setPositionRelative(),i[0]!==this.element[0]&&!/(fixed|absolute)/.test(i.css("position"))&&i.css("position","absolute"),i},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),n=this.document[0];return this.cssPosition==="absolute"&&this.scrollParent[0]!==n&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition!=="relative")return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,n,r,i=this.options,s=this.document[0];this.relativeContainer=null;if(!i.containment){this.containment=null;return}if(i.containment==="window"){this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||s.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];return}if(i.containment==="document"){this.containment=[0,0,e(s).width()-this.helperProportions.width-this.margins.left,(e(s).height()||s.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];return}if(i.containment.constructor===Array){this.containment=i.containment;return}i.containment==="parent"&&(i.containment=this.helper[0].parentNode),n=e(i.containment),r=n[0];if(!r)return;t=/(scroll|auto)/.test(n.css("overflow")),this.containment=[(parseInt(n.css("borderLeftWidth"),10)||0)+(parseInt(n.css("paddingLeft"),10)||0),(parseInt(n.css("borderTopWidth"),10)||0)+(parseInt(n.css("paddingTop"),10)||0),(t?Math.max(r.scrollWidth,r.offsetWidth):r.offsetWidth)-(parseInt(n.css("borderRightWidth"),10)||0)-(parseInt(n.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(r.scrollHeight,r.offsetHeight):r.offsetHeight)-(parseInt(n.css("borderBottomWidth"),10)||0)-(parseInt(n.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=n},_convertPositionTo:function(e,t){t||(t=this.position);var n=e==="absolute"?1:-1,r=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*n+this.offset.parent.top*n-(this.cssPosition==="fixed"?-this.offset.scroll.top:r?0:this.offset.scroll.top)*n,left:t.left+this.offset.relative.left*n+this.offset.parent.left*n-(this.cssPosition==="fixed"?-this.offset.scroll.left:r?0:this.offset.scroll.left)*n}},_generatePosition:function(e,t){var n,r,i,s,o=this.options,u=this._isRootNode(this.scrollParent[0]),a=e.pageX,f=e.pageY;if(!u||!this.offset.scroll)this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()};return t&&(this.containment&&(this.relativeContainer?(r=this.relativeContainer.offset(),n=[this.containment[0]+r.left,this.containment[1]+r.top,this.containment[2]+r.left,this.containment[3]+r.top]):n=this.containment,e.pageX-this.offset.click.leftn[2]&&(a=n[2]+this.offset.click.left),e.pageY-this.offset.click.top>n[3]&&(f=n[3]+this.offset.click.top)),o.grid&&(i=o.grid[1]?this.originalPageY+Math.round((f-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,f=n?i-this.offset.click.top>=n[1]||i-this.offset.click.top>n[3]?i:i-this.offset.click.top>=n[1]?i-o.grid[1]:i+o.grid[1]:i,s=o.grid[0]?this.originalPageX+Math.round((a-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,a=n?s-this.offset.click.left>=n[0]||s-this.offset.click.left>n[2]?s:s-this.offset.click.left>=n[0]?s-o.grid[0]:s+o.grid[0]:s),o.axis==="y"&&(a=this.originalPageX),o.axis==="x"&&(f=this.originalPageY)),{top:f-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.offset.scroll.top:u?0:this.offset.scroll.top),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.offset.scroll.left:u?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!==this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){this.options.axis!=="y"&&this.helper.css("right")!=="auto"&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),this.options.axis!=="x"&&this.helper.css("bottom")!=="auto"&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,n,r){return r=r||this._uiHash(),e.ui.plugin.call(this,t,[n,r,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),r.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,n,r)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,n,r){var i=e.extend({},n,{item:r.element});r.sortables=[],e(r.options.connectToSortable).each(function(){var n=e(this).sortable("instance");n&&!n.options.disabled&&(r.sortables.push(n),n.refreshPositions(),n._trigger("activate",t,i))})},stop:function(t,n,r){var i=e.extend({},n,{item:r.element});r.cancelHelperRemoval=!1,e.each(r.sortables,function(){var e=this;e.isOver?(e.isOver=0,r.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,i))})},drag:function(t,n,r){e.each(r.sortables,function(){var i=!1,s=this;s.positionAbs=r.positionAbs,s.helperProportions=r.helperProportions,s.offset.click=r.offset.click,s._intersectsWith(s.containerCache)&&(i=!0,e.each(r.sortables,function(){return this.positionAbs=r.positionAbs,this.helperProportions=r.helperProportions,this.offset.click=r.offset.click,this!==s&&this._intersectsWith(this.containerCache)&&e.contains(s.element[0],this.element[0])&&(i=!1),i})),i?(s.isOver||(s.isOver=1,r._parent=n.helper.parent(),s.currentItem=n.helper.appendTo(s.element).data("ui-sortable-item",!0),s.options._helper=s.options.helper,s.options.helper=function(){return n.helper[0]},t.target=s.currentItem[0],s._mouseCapture(t,!0),s._mouseStart(t,!0,!0),s.offset.click.top=r.offset.click.top,s.offset.click.left=r.offset.click.left,s.offset.parent.left-=r.offset.parent.left-s.offset.parent.left,s.offset.parent.top-=r.offset.parent.top-s.offset.parent.top,r._trigger("toSortable",t),r.dropped=s.element,e.each(r.sortables,function(){this.refreshPositions()}),r.currentItem=r.element,s.fromOutside=r),s.currentItem&&(s._mouseDrag(t),n.position=s.position)):s.isOver&&(s.isOver=0,s.cancelHelperRemoval=!0,s.options._revert=s.options.revert,s.options.revert=!1,s._trigger("out",t,s._uiHash(s)),s._mouseStop(t,!0),s.options.revert=s.options._revert,s.options.helper=s.options._helper,s.placeholder&&s.placeholder.remove(),n.helper.appendTo(r._parent),r._refreshOffsets(t),n.position=r._generatePosition(t,!0),r._trigger("fromSortable",t),r.dropped=!1,e.each(r.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,n,r){var i=e("body"),s=r.options;i.css("cursor")&&(s._cursor=i.css("cursor")),i.css("cursor",s.cursor)},stop:function(t,n,r){var i=r.options;i._cursor&&e("body").css("cursor",i._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,n,r){var i=e(n.helper),s=r.options;i.css("opacity")&&(s._opacity=i.css("opacity")),i.css("opacity",s.opacity)},stop:function(t,n,r){var i=r.options;i._opacity&&e(n.helper).css("opacity",i._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,n){n.scrollParentNotHidden||(n.scrollParentNotHidden=n.helper.scrollParent(!1)),n.scrollParentNotHidden[0]!==n.document[0]&&n.scrollParentNotHidden[0].tagName!=="HTML"&&(n.overflowOffset=n.scrollParentNotHidden.offset())},drag:function(t,n,r){var i=r.options,s=!1,o=r.scrollParentNotHidden[0],u=r.document[0];if(o!==u&&o.tagName!=="HTML"){if(!i.axis||i.axis!=="x")r.overflowOffset.top+o.offsetHeight-t.pageY=0;h--){a=r.snapElements[h].left-r.margins.left,f=a+r.snapElements[h].width,l=r.snapElements[h].top-r.margins.top,c=l+r.snapElements[h].height;if(gf+v||bc+v||!e.contains(r.snapElements[h].item.ownerDocument,r.snapElements[h].item)){r.snapElements[h].snapping&&r.options.snap.release&&r.options.snap.release.call(r.element,t,e.extend(r._uiHash(),{snapItem:r.snapElements[h].item})),r.snapElements[h].snapping=!1;continue}d.snapMode!=="inner"&&(i=Math.abs(l-b)<=v,s=Math.abs(c-y)<=v,o=Math.abs(a-g)<=v,u=Math.abs(f-m)<=v,i&&(n.position.top=r._convertPositionTo("relative",{top:l-r.helperProportions.height,left:0}).top),s&&(n.position.top=r._convertPositionTo("relative",{top:c,left:0}).top),o&&(n.position.left=r._convertPositionTo("relative",{top:0,left:a-r.helperProportions.width}).left),u&&(n.position.left=r._convertPositionTo("relative",{top:0,left:f}).left)),p=i||s||o||u,d.snapMode!=="outer"&&(i=Math.abs(l-y)<=v,s=Math.abs(c-b)<=v,o=Math.abs(a-m)<=v,u=Math.abs(f-g)<=v,i&&(n.position.top=r._convertPositionTo("relative",{top:l,left:0}).top),s&&(n.position.top=r._convertPositionTo("relative",{top:c-r.helperProportions.height,left:0}).top),o&&(n.position.left=r._convertPositionTo("relative",{top:0,left:a}).left),u&&(n.position.left=r._convertPositionTo("relative",{top:0,left:f-r.helperProportions.width}).left)),!r.snapElements[h].snapping&&(i||s||o||u||p)&&r.options.snap.snap&&r.options.snap.snap.call(r.element,t,e.extend(r._uiHash(),{snapItem:r.snapElements[h].item})),r.snapElements[h].snapping=i||s||o||u||p}}}),e.ui.plugin.add("draggable","stack",{start:function(t,n,r){var i,s=r.options,o=e.makeArray(e(s.stack)).sort(function(t,n){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(n).css("zIndex"),10)||0)});if(!o.length)return;i=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",i+t)}),this.css("zIndex",i+o.length)}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,n,r){var i=e(n.helper),s=r.options;i.css("zIndex")&&(s._zIndex=i.css("zIndex")),i.css("zIndex",s.zIndex)},stop:function(t,n,r){var i=r.options;i._zIndex&&e(n.helper).css("zIndex",i._zIndex)}}),e.ui.draggable});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/droppable-min.js b/core/assets/vendor/jquery.ui/ui/droppable-min.js
deleted file mode 100644
index 0b8734114..000000000
--- a/core/assets/vendor/jquery.ui/ui/droppable-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Droppable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/droppable/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./widget","./mouse","./draggable"],e):e(jQuery)})(function(e){return e.widget("ui.droppable",{version:"1.11.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,n=this.options,r=n.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(r)?r:function(e){return e.is(r)},this.proportions=function(){if(!arguments.length)return t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};t=arguments[0]},this._addToManager(n.scope),n.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){var t=0;for(;t=t&&e=l&&o<=h||a>=l&&a<=h||oh)&&(s>=f&&s<=c||u>=f&&u<=c||sc);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,n){var r,i,s=e.ui.ddmanager.droppables[t.options.scope]||[],o=n?n.type:null,u=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(r=0;r1&&b.splice.apply(b,[1,0].concat(b.splice(w,c+1))),r.dequeue()}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-clip-min.js b/core/assets/vendor/jquery.ui/ui/effect-clip-min.js
deleted file mode 100644
index 3e1041ead..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-clip-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Clip 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/clip-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.clip=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"vertical",a=u==="vertical",f=a?"height":"width",l=a?"top":"left",c={},h,p,d;e.effects.save(r,i),r.show(),h=e.effects.createWrapper(r).css({overflow:"hidden"}),p=r[0].tagName==="IMG"?h:r,d=p[f](),o&&(p.css(f,0),p.css(l,d/2)),c[f]=o?d:0,c[l]=o?0:d/2,p.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o||r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-drop-min.js b/core/assets/vendor/jquery.ui/ui/effect-drop-min.js
deleted file mode 100644
index 4a707a63f..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-drop-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Drop 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/drop-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.drop=function(t,n){var r=e(this),i=["position","top","bottom","left","right","opacity","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left"?"pos":"neg",l={opacity:o?1:0},c;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),c=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0)/2,o&&r.css("opacity",0).css(a,f==="pos"?-c:c),l[a]=(o?f==="pos"?"+=":"-=":f==="pos"?"-=":"+=")+c,r.animate(l,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-explode-min.js b/core/assets/vendor/jquery.ui/ui/effect-explode-min.js
deleted file mode 100644
index a8e5d7b96..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-explode-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Explode 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/explode-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.explode=function(t,n){function y(){c.push(this),c.length===r*i&&b()}function b(){s.css({visibility:"visible"}),e(c).remove(),u||s.hide(),n()}var r=t.pieces?Math.round(Math.sqrt(t.pieces)):3,i=r,s=e(this),o=e.effects.setMode(s,t.mode||"hide"),u=o==="show",a=s.show().css("visibility","hidden").offset(),f=Math.ceil(s.outerWidth()/i),l=Math.ceil(s.outerHeight()/r),c=[],h,p,d,v,m,g;for(h=0;h
").css({position:"absolute",visibility:"visible",left:-p*f,top:-h*l}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:f,height:l,left:d+(u?m*f:0),top:v+(u?g*l:0),opacity:u?0:1}).animate({left:d+(u?0:m*f),top:v+(u?0:g*l),opacity:u?1:0},t.duration||500,t.easing,y)}}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-fade-min.js b/core/assets/vendor/jquery.ui/ui/effect-fade-min.js
deleted file mode 100644
index ca491188b..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-fade-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Fade 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/fade-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.fade=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"toggle");r.animate({opacity:i},{queue:!1,duration:t.duration,easing:t.easing,complete:n})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-fold-min.js b/core/assets/vendor/jquery.ui/ui/effect-fold-min.js
deleted file mode 100644
index e09b24ea9..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-fold-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Fold 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/fold-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.fold=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=s==="hide",a=t.size||15,f=/([0-9]+)%/.exec(a),l=!!t.horizFirst,c=o!==l,h=c?["width","height"]:["height","width"],p=t.duration/2,d,v,m={},g={};e.effects.save(r,i),r.show(),d=e.effects.createWrapper(r).css({overflow:"hidden"}),v=c?[d.width(),d.height()]:[d.height(),d.width()],f&&(a=parseInt(f[1],10)/100*v[u?0:1]),o&&d.css(l?{height:0,width:a}:{height:a,width:0}),m[h[0]]=o?v[0]:a,g[h[1]]=o?v[1]:0,d.animate(m,p,t.easing).animate(g,p,t.easing,function(){u&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-highlight-min.js b/core/assets/vendor/jquery.ui/ui/effect-highlight-min.js
deleted file mode 100644
index d9a05842e..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-highlight-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Highlight 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/highlight-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.highlight=function(t,n){var r=e(this),i=["backgroundImage","backgroundColor","opacity"],s=e.effects.setMode(r,t.mode||"show"),o={backgroundColor:r.css("backgroundColor")};s==="hide"&&(o.opacity=0),e.effects.save(r,i),r.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),n()}})}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-puff-min.js b/core/assets/vendor/jquery.ui/ui/effect-puff-min.js
deleted file mode 100644
index 0be2f6d30..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-puff-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Puff 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/puff-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect","./effect-scale"],e):e(jQuery)})(function(e){return e.effects.effect.puff=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"hide"),s=i==="hide",o=parseInt(t.percent,10)||150,u=o/100,a={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:i,complete:n,percent:s?o:100,from:s?a:{height:a.height*u,width:a.width*u,outerHeight:a.outerHeight*u,outerWidth:a.outerWidth*u}}),r.effect(t)}});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/effect-pulsate-min.js b/core/assets/vendor/jquery.ui/ui/effect-pulsate-min.js
deleted file mode 100644
index 58ea01e8a..000000000
--- a/core/assets/vendor/jquery.ui/ui/effect-pulsate-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Effects Pulsate 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/pulsate-effect/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./effect"],e):e(jQuery)})(function(e){return e.effects.effect.pulsate=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"show"),s=i==="show",o=i==="hide",u=s||i==="hide",a=(t.times||5)*2+(u?1:0),f=t.duration/a,l=0,c=r.queue(),h=c.length,p;if(s||!r.is(":visible"))r.css("opacity",0).show(),l=1;for(p=1;p- ",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var n=e(t.target);!this.mouseHandled&&n.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),n.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(this.previousFilter)return;var n=e(t.currentTarget);n.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,n)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var n=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,n)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var n,r,i,s,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,n=this._filterMenuItems(i),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),n=this._filterMenuItems(i)),n.length?(this.focus(t,n),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,n,r=this,i=this.options.icons.submenu,s=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),n=t.parent(),r=e("").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);n.attr("aria-haspopup","true").prepend(r),t.attr("aria-labelledby",n.attr("id"))}),t=s.add(this.element),n=t.find(this.options.items),n.not(".ui-menu-item").each(function(){var t=e(this);r._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),n.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),n.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){e==="icons"&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),e==="disabled"&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&e&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.outerHeight(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},blur:function(e,t){t||clearTimeout(this.timer);if(!this.active)return;this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},_startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},_open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},collapseAll:function(t,n){clearTimeout(this.timer),this.timer=this._delay(function(){var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));r.length||(r=this.element),this._close(r),this.blur(t),this.activeMenu=r},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,n){var r;this.active&&(e==="first"||e==="last"?r=this.active[e==="first"?"prevAll":"nextAll"](".ui-menu-item").eq(-1):r=this.active[e+"All"](".ui-menu-item").eq(0));if(!r||!r.length||!this.active)r=this.activeMenu.find(this.options.items)[t]();this.focus(n,r)},nextPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isLastItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r-i<0}),this.focus(t,n)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())},previousPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isFirstItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r+i>0}),this.focus(t,n)):this.focus(t,this.activeMenu.find(this.options.items).first())},_hasScroll:function(){return this.element.outerHeight()
- ",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("
",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,n){e.preventDefault(),t._setSelection(),t._select(n.item.data("ui-selectmenu-item"),e)},focus:function(e,n){var r=n.item.data("ui-selectmenu-item");t.focusIndex!=null&&r.index!==t.focusIndex&&(t._trigger("focus",e,{item:r}),t.isOpen||t._select(r,e)),t.focusIndex=r.index,t.button.attr("aria-activedescendant",t.menuItems.eq(r.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");if(!t.length)return;this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled"))},open:function(e){if(this.options.disabled)return;this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e)},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){if(!this.isOpen)return;this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",e)},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,n){var r=this,i="";e.each(n,function(n,s){s.optgroup!==i&&(e("
").appendTo(this.element),n="ui-slider-range ui-widget-header ui-corner-all"):this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}),this.range.addClass(n+(t.range==="min"||t.range==="max"?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var n,r,i,s,o,u,a,f,l=this,c=this.options;return c.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),n={x:t.pageX,y:t.pageY},r=this._normValueFromMouse(n),i=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var n=Math.abs(r-l.values(t));if(i>n||i===n&&(t===l._lastChangedValue||l.values(t)===c.min))i=n,s=e(this),o=t}),u=this._start(t,o),u===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,s.addClass("ui-state-active").focus(),a=s.offset(),f=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=f?{left:0,top:0}:{left:t.pageX-a.left-s.width()/2,top:t.pageY-a.top-s.height()/2-(parseInt(s.css("borderTopWidth"),10)||0)-(parseInt(s.css("borderBottomWidth"),10)||0)+(parseInt(s.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,r),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},n=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,n),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,n,r,i,s;return this.orientation==="horizontal"?(t=this.elementSize.width,n=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,n=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),r=n/t,r>1&&(r=1),r<0&&(r=0),this.orientation==="vertical"&&(r=1-r),i=this._valueMax()-this._valueMin(),s=this._valueMin()+r*i,this._trimAlignValue(s)},_start:function(e,t){var n={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("start",e,n)},_slide:function(e,t,n){var r,i,s;this.options.values&&this.options.values.length?(r=this.values(t?0:1),this.options.values.length===2&&this.options.range===!0&&(t===0&&n>r||t===1&&n").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var n=0,r;r=this.tabs[n];n++)t===!0||e.inArray(n,t)!==-1?e(r).addClass("ui-state-disabled").attr("aria-disabled","true"):e(r).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var n={};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,n),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var n,r=this.element.parent();t==="fill"?(n=r.height(),n-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),r=t.css("position");if(r==="absolute"||r==="fixed")return;n-=t.outerHeight(!0)}),this.element.children().not(this.panels).each(function(){n-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,n-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):t==="auto"&&(n=0,this.panels.each(function(){n=Math.max(n,e(this).height("").height())}).height(n))},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i.closest("li"),o=s[0]===r[0],u=o&&n.collapsible,a=u?e():this._getPanelForTab(s),f=r.length?this._getPanelForTab(r):e(),l={oldTab:r,oldPanel:f,newTab:u?e():s,newPanel:a};t.preventDefault();if(s.hasClass("ui-state-disabled")||s.hasClass("ui-tabs-loading")||this.running||o&&!n.collapsible||this._trigger("beforeActivate",t,l)===!1)return;n.active=u?!1:this.tabs.index(s),this.active=o?e():s,this.xhr&&this.xhr.abort(),!f.length&&!a.length&&e.error("jQuery UI Tabs: Mismatching fragment identifier."),a.length&&this.load(this.tabs.index(s),t),this._toggle(t,l)},_toggle:function(t,n){function o(){r.running=!1,r._trigger("activate",t,n)}function u(){n.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),i.length&&r.options.show?r._show(i,r.options.show,o):(i.show(),o())}var r=this,i=n.newPanel,s=n.oldPanel;this.running=!0,s.length&&this.options.hide?this._hide(s,this.options.hide,function(){n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),s.hide(),u()),s.attr("aria-hidden","true"),n.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?n.oldTab.attr("tabIndex",-1):i.length&&this.tabs.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),i.attr("aria-hidden","false"),n.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var n,r=this._findActive(t);if(r[0]===this.active[0])return;r.length||(r=this.active),n=r.find(".ui-tabs-anchor")[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return typeof e=="string"&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),n=t.data("ui-tabs-aria-controls");n?t.attr("aria-controls",n).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(t){var n=this.options.disabled;if(n===!1)return;t===undefined?n=!1:(t=this._getIndex(t),e.isArray(n)?n=e.map(n,function(e){return e!==t?e:null}):n=e.map(this.tabs,function(e,n){return n!==t?n:null})),this._setupDisabled(n)},disable:function(t){var n=this.options.disabled;if(n===!0)return;if(t===undefined)n=!0;else{t=this._getIndex(t);if(e.inArray(t,n)!==-1)return;e.isArray(n)?n=e.merge([t],n).sort():n=[t]}this._setupDisabled(n)},load:function(t,n){t=this._getIndex(t);var r=this,i=this.tabs.eq(t),s=i.find(".ui-tabs-anchor"),o=this._getPanelForTab(i),u={tab:i,panel:o},a=function(e,t){t==="abort"&&r.panels.stop(!1,!0),i.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===r.xhr&&delete r.xhr};if(this._isLocal(s[0]))return;this.xhr=e.ajax(this._ajaxSettings(s,n,u)),this.xhr&&this.xhr.statusText!=="canceled"&&(i.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.done(function(e,t,i){setTimeout(function(){o.html(e),r._trigger("load",n,u),a(i,t)},1)}).fail(function(e,t){setTimeout(function(){a(e,t)},1)}))},_ajaxSettings:function(t,n,r){var i=this;return{url:t.attr("href"),beforeSend:function(t,s){return i._trigger("beforeLoad",n,e.extend({jqXHR:t,ajaxSettings:s},r))}}},_getPanelForTab:function(t){var n=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+n))}})});
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/tooltip-min.js b/core/assets/vendor/jquery.ui/ui/tooltip-min.js
deleted file mode 100644
index 677c1fbf6..000000000
--- a/core/assets/vendor/jquery.ui/ui/tooltip-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * jQuery UI Tooltip 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/tooltip/
- */(function(e){typeof define=="function"&&define.amd?define(["jquery","./core","./widget","./position"],e):e(jQuery)})(function(e){return e.widget("ui.tooltip",{version:"1.11.4",options:{content:function(){var t=e(this).attr("title")||"";return e("").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,n){var r=(t.attr("aria-describedby")||"").split(/\s+/);r.push(n),t.data("ui-tooltip-id",n).attr("aria-describedby",e.trim(r.join(" ")))},_removeDescribedBy:function(t){var n=t.data("ui-tooltip-id"),r=(t.attr("aria-describedby")||"").split(/\s+/),i=e.inArray(n,r);i!==-1&&r.splice(i,1),t.removeData("ui-tooltip-id"),r=e.trim(r.join(" ")),r?t.attr("aria-describedby",r):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("
").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,n){var r=this;if(t==="disabled"){this[n?"_disable":"_enable"](),this.options[t]=n;return}this._super(t,n),t==="content"&&e.each(this.tooltips,function(e,t){r._updateContent(t.element)})},_disable:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r.element[0],t.close(i,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var n=this,r=e(t?t.target:this.element).closest(this.options.items);if(!r.length||r.data("ui-tooltip-id"))return;r.attr("title")&&r.data("ui-tooltip-title",r.attr("title")),r.data("ui-tooltip-open",!0),t&&t.type==="mouseover"&&r.parents().each(function(){var t=e(this),r;t.data("ui-tooltip-open")&&(r=e.Event("blur"),r.target=r.currentTarget=this,n.close(r,!0)),t.attr("title")&&(t.uniqueId(),n.parents[this.id]={element:this,title:t.attr("title")},t.attr("title",""))}),this._registerCloseHandlers(t,r),this._updateContent(r,t)},_updateContent:function(e,t){var n,r=this.options.content,i=this,s=t?t.type:null;if(typeof r=="string")return this._open(t,e,r);n=r.call(e[0],function(n){i._delay(function(){if(!e.data("ui-tooltip-open"))return;t&&(t.type=s),this._open(t,e,n)})}),n&&this._open(t,e,n)},_open:function(t,n,r){function f(e){a.of=e;if(s.is(":hidden"))return;s.position(a)}var i,s,o,u,a=e.extend({},this.options.position);if(!r)return;i=this._find(n);if(i){i.tooltip.find(".ui-tooltip-content").html(r);return}n.is("[title]")&&(t&&t.type==="mouseover"?n.attr("title",""):n.removeAttr("title")),i=this._tooltip(n),s=i.tooltip,this._addDescribedBy(n,s.attr("id")),s.find(".ui-tooltip-content").html(r),this.liveRegion.children().hide(),r.clone?(u=r.clone(),u.removeAttr("id").find("[id]").removeAttr("id")):u=r,e("
").html(u).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:f}),f(t)):s.position(e.extend({of:n},this.options.position)),s.hide(),this._show(s,this.options.show),this.options.show&&this.options.show.delay&&(o=this.delayedShow=setInterval(function(){s.is(":visible")&&(f(a.of),clearInterval(o))},e.fx.interval)),this._trigger("open",t,{tooltip:s})},_registerCloseHandlers:function(t,n){var r={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var r=e.Event(t);r.currentTarget=n[0],this.close(r,!0)}}};n[0]!==this.element[0]&&(r.remove=function(){this._removeTooltip(this._find(n).tooltip)});if(!t||t.type==="mouseover")r.mouseleave="close";if(!t||t.type==="focusin")r.focusout="close";this._on(!0,n,r)},close:function(t){var n,r=this,i=e(t?t.currentTarget:this.element),s=this._find(i);if(!s){i.removeData("ui-tooltip-open");return}n=s.tooltip;if(s.closing)return;clearInterval(this.delayedShow),i.data("ui-tooltip-title")&&!i.attr("title")&&i.attr("title",i.data("ui-tooltip-title")),this._removeDescribedBy(i),s.hiding=!0,n.stop(!0),this._hide(n,this.options.hide,function(){r._removeTooltip(e(this))}),i.removeData("ui-tooltip-open"),this._off(i,"mouseleave focusout keyup"),i[0]!==this.element[0]&&this._off(i,"remove"),this._off(this.document,"mousemove"),t&&t.type==="mouseleave"&&e.each(this.parents,function(t,n){e(n.element).attr("title",n.title),delete r.parents[t]}),s.closing=!0,this._trigger("close",t,{tooltip:n}),s.hiding||(s.closing=!1)},_tooltip:function(t){var n=e("
").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),r=n.uniqueId().attr("id");return e("',
- 'title' => 'Test Title 02',
- 'cache' => -1,
- 'roles' => [2]
- ),
- );
- /**
- * Sample block table.
- */
- protected $expectedBlocks = array(
- array(
- 'bid' => 1,
- 'module' => 'block',
- 'delta' => '1',
- 'theme' => 'garland',
- 'status' => 1,
- 'weight' => 0,
- 'region' => 'left',
- 'visibility' => 0,
- 'pages' => '',
- 'title' => 'Test Title 01',
- 'cache' => -1,
- ),
- array(
- 'bid' => 2,
- 'module' => 'block',
- 'delta' => '2',
- 'theme' => 'garland',
- 'status' => 1,
- 'weight' => 5,
- 'region' => 'right',
- 'visibility' => 0,
- 'pages' => '',
- 'title' => 'Test Title 02',
- 'cache' => -1,
- ),
- );
-
- /**
- * Sample block roles table.
- */
- protected $expectedBlocksRoles = array(
- array(
- 'module' => 'block',
- 'delta' => 1,
- 'rid' => 2,
- ),
- array(
- 'module' => 'block',
- 'delta' => 2,
- 'rid' => 2,
- ),
- array(
- 'module' => 'block',
- 'delta' => 2,
- 'rid' => 100,
- ),
- );
-
- /**
- * Sample role table.
- */
- protected $expectedRole = array(
- array(
- 'rid' => 2,
- 'name' => 'authenticated user',
- ),
- );
-
- /**
- * Prepopulate database contents.
- */
- protected function setUp() {
- $this->databaseContents['blocks'] = $this->expectedBlocks;
- $this->databaseContents['blocks_roles'] = $this->expectedBlocksRoles;
- $this->databaseContents['role'] = $this->expectedRole;
- $this->databaseContents['system'] = array(
- array(
- 'filename' => 'modules/system/system.module',
- 'name' => 'system',
- 'type' => 'module',
- 'owner' => '',
- 'status' => '1',
- 'throttle' => '0',
- 'bootstrap' => '0',
- 'schema_version' => '6055',
- 'weight' => '0',
- 'info' => 'a:0:{}',
- )
- );
- parent::setUp();
- }
-
-}
diff --git a/core/modules/block_content/block_content.info.yml b/core/modules/block_content/block_content.info.yml
index 42e9054cc..9919b4e39 100644
--- a/core/modules/block_content/block_content.info.yml
+++ b/core/modules/block_content/block_content.info.yml
@@ -10,8 +10,8 @@ dependencies:
- user
configure: entity.block_content.collection
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block_content/js/block_content.js b/core/modules/block_content/js/block_content.js
deleted file mode 100644
index bbc0533b2..000000000
--- a/core/modules/block_content/js/block_content.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @file
- * Defines Javascript behaviors for the block_content module.
- */
-
-(function ($, Drupal) {
-
- 'use strict';
-
- /**
- * Sets summaries about revision and translation of block content.
- *
- * @type {Drupal~behavior}
- *
- * @prop {Drupal~behaviorAttach} attach
- * Attaches summary behaviour block content form tabs.
- *
- * Specifically, it updates summaries to the revision information and the
- * translation options.
- */
- Drupal.behaviors.blockContentDetailsSummaries = {
- attach: function (context) {
- var $context = $(context);
- $context.find('.block-content-form-revision-information').drupalSetSummary(function (context) {
- var $revisionContext = $(context);
- var revisionCheckbox = $revisionContext.find('.js-form-item-revision input');
-
- // Return 'New revision' if the 'Create new revision' checkbox is checked,
- // or if the checkbox doesn't exist, but the revision log does. For users
- // without the "Administer content" permission the checkbox won't appear,
- // but the revision log will if the content type is set to auto-revision.
- if (revisionCheckbox.is(':checked') || (!revisionCheckbox.length && $revisionContext.find('.js-form-item-revision-log textarea').length)) {
- return Drupal.t('New revision');
- }
-
- return Drupal.t('No revision');
- });
-
- $context.find('fieldset.block-content-translation-options').drupalSetSummary(function (context) {
- var $translationContext = $(context);
- var translate;
- var $checkbox = $translationContext.find('.js-form-item-translation-translate input');
-
- if ($checkbox.size()) {
- translate = $checkbox.is(':checked') ? Drupal.t('Needs to be updated') : Drupal.t('Does not need to be updated');
- }
- else {
- $checkbox = $translationContext.find('.js-form-item-translation-retranslate input');
- translate = $checkbox.is(':checked') ? Drupal.t('Flag other translations as outdated') : Drupal.t('Do not flag other translations as outdated');
- }
-
- return translate;
- });
- }
- };
-
-})(jQuery, Drupal);
diff --git a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
deleted file mode 100644
index 7eefdc7a2..000000000
--- a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
- 'basic',
- 'label' => 'basic',
- 'revision' => FALSE
- ));
- $block_content_type->save();
- block_content_add_body_field($block_content_type->id());
-
- // Create a "Llama" custom block.
- $block_content = BlockContent::create(array(
- 'info' => 'Llama',
- 'type' => 'basic',
- 'body' => array(
- 'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
- 'format' => 'plain_text',
- ),
- ));
- $block_content->save();
-
- return $block_content;
- }
-
- /**
- * {@inheritdoc}
- *
- * @see \Drupal\block_content\BlockContentAccessControlHandler::checkAccess()
- */
- protected function getAccessCacheContextsForEntity(EntityInterface $entity) {
- return [];
- }
-
- /**
- * {@inheritdoc}
- *
- * Each comment must have a comment body, which always has a text format.
- */
- protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
- return ['config:filter.format.plain_text'];
- }
-
- /**
- * Tests that the block is cached with the correct contexts and tags.
- */
- public function testBlock() {
- $block = $this->drupalPlaceBlock('block_content:' . $this->entity->uuid());
- $build = $this->container->get('entity.manager')->getViewBuilder('block')->view($block, 'block');
-
- // Render the block.
- // @todo The request stack manipulation won't be necessary once
- // https://www.drupal.org/node/2367555 is fixed and the
- // corresponding $request->isMethodSafe() checks are removed from
- // Drupal\Core\Render\Renderer.
- $request_stack = $this->container->get('request_stack');
- $request_stack->push(new Request());
- $this->container->get('renderer')->renderRoot($build);
- $request_stack->pop();
-
- // Expected keys, contexts, and tags for the block.
- // @see \Drupal\block\BlockViewBuilder::viewMultiple()
- $expected_block_cache_keys = ['entity_view', 'block', $block->id()];
- $expected_block_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
- $expected_block_cache_tags = Cache::mergeTags(['block_view', 'rendered'], $block->getCacheTags());
- $expected_block_cache_tags = Cache::mergeTags($expected_block_cache_tags, $block->getPlugin()->getCacheTags());
-
- // Expected contexts and tags for the BlockContent entity.
- // @see \Drupal\Core\Entity\EntityViewBuilder::getBuildDefaults().
- $expected_entity_cache_contexts = ['theme'];
- $expected_entity_cache_tags = Cache::mergeTags(['block_content_view'], $this->entity->getCacheTags());
- $expected_entity_cache_tags = Cache::mergeTags($expected_entity_cache_tags, $this->getAdditionalCacheTagsForEntity($this->entity));
-
- // Verify that what was render cached matches the above expectations.
- $cid = $this->createCacheId($expected_block_cache_keys, $expected_block_cache_contexts);
- $redirected_cid = $this->createCacheId($expected_block_cache_keys, Cache::mergeContexts($expected_block_cache_contexts, $expected_entity_cache_contexts));
- $this->verifyRenderCache($cid, Cache::mergeTags($expected_block_cache_tags, $expected_entity_cache_tags), ($cid !== $redirected_cid) ? $redirected_cid : NULL);
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php
deleted file mode 100644
index 0cca85ee8..000000000
--- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php
+++ /dev/null
@@ -1,302 +0,0 @@
-drupalLogin($this->adminUser);
- }
-
- /**
- * Creates a "Basic page" block and verifies its consistency in the database.
- */
- public function testBlockContentCreation() {
- $this->drupalLogin($this->adminUser);
-
- // Create a block.
- $edit = array();
- $edit['info[0][value]'] = 'Test Block';
- $edit['body[0][value]'] = $this->randomMachineName(16);
- $this->drupalPostForm('block/add/basic', $edit, t('Save'));
-
- // Check that the Basic block has been created.
- $this->assertRaw(format_string('@block %name has been created.', array(
- '@block' => 'basic',
- '%name' => $edit['info[0][value]']
- )), 'Basic block created.');
-
- // Check that the view mode setting is hidden because only one exists.
- $this->assertNoFieldByXPath('//select[@name="settings[view_mode]"]', NULL, 'View mode setting hidden because only one exists');
-
- // Check that the block exists in the database.
- $blocks = entity_load_multiple_by_properties('block_content', array('info' => $edit['info[0][value]']));
- $block = reset($blocks);
- $this->assertTrue($block, 'Custom Block found in database.');
-
- // Check that attempting to create another block with the same value for
- // 'info' returns an error.
- $this->drupalPostForm('block/add/basic', $edit, t('Save'));
-
- // Check that the Basic block has been created.
- $this->assertRaw(format_string('A custom block with block description %value already exists.', array(
- '%value' => $edit['info[0][value]']
- )));
- $this->assertResponse(200);
- }
-
- /**
- * Creates a "Basic page" block with multiple view modes.
- */
- public function testBlockContentCreationMultipleViewModes() {
- // Add a new view mode and verify if it is selected as expected.
- $this->drupalLogin($this->drupalCreateUser(array('administer display modes')));
- $this->drupalGet('admin/structure/display-modes/view/add/block_content');
- $edit = array(
- 'id' => 'test_view_mode',
- 'label' => 'Test View Mode',
- );
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('Saved the %label view mode.', array('%label' => $edit['label'])));
-
- $this->drupalLogin($this->adminUser);
-
- // Create a block.
- $edit = array();
- $edit['info[0][value]'] = 'Test Block';
- $edit['body[0][value]'] = $this->randomMachineName(16);
- $this->drupalPostForm('block/add/basic', $edit, t('Save'));
-
- // Check that the Basic block has been created.
- $this->assertRaw(format_string('@block %name has been created.', array(
- '@block' => 'basic',
- '%name' => $edit['info[0][value]']
- )), 'Basic block created.');
-
- // Save our block permanently
- $this->drupalPostForm(NULL, NULL, t('Save block'));
-
- // Set test_view_mode as a custom display to be available on the list.
- $this->drupalGet('admin/structure/block/block-content');
- $this->drupalGet('admin/structure/block/block-content/types');
- $this->clickLink(t('Manage display'));
- $this->drupalGet('admin/structure/block/block-content/manage/basic/display');
- $custom_view_mode = array(
- 'display_modes_custom[test_view_mode]' => 1,
- );
- $this->drupalPostForm(NULL, $custom_view_mode, t('Save'));
-
- // Go to the configure page and change the view mode.
- $this->drupalGet('admin/structure/block/manage/testblock');
-
- // Test the available view mode options.
- $this->assertOption('edit-settings-view-mode', 'default', 'The default view mode is available.');
- $this->assertOption('edit-settings-view-mode', 'test_view_mode', 'The test view mode is available.');
-
- $view_mode['settings[view_mode]'] = 'test_view_mode';
- $this->drupalPostForm(NULL, $view_mode, t('Save block'));
-
- // Check that the view mode setting is shown because more than one exists.
- $this->drupalGet('admin/structure/block/manage/testblock');
- $this->assertFieldByXPath('//select[@name="settings[view_mode]"]', NULL, 'View mode setting shown because multiple exist');
-
- // Change the view mode.
- $view_mode['settings[view_mode]'] = 'test_view_mode';
- $this->drupalPostForm(NULL, $view_mode, t('Save block'));
-
- // Go to the configure page and verify the view mode has changed.
- $this->drupalGet('admin/structure/block/manage/testblock');
- $this->assertFieldByXPath('//select[@name="settings[view_mode]"]/option[@selected="selected"]/@value', 'test_view_mode', 'View mode changed to Test View Mode');
-
- // Check that the block exists in the database.
- $blocks = entity_load_multiple_by_properties('block_content', array('info' => $edit['info[0][value]']));
- $block = reset($blocks);
- $this->assertTrue($block, 'Custom Block found in database.');
-
- // Check that attempting to create another block with the same value for
- // 'info' returns an error.
- $this->drupalPostForm('block/add/basic', $edit, t('Save'));
-
- // Check that the Basic block has been created.
- $this->assertRaw(format_string('A custom block with block description %value already exists.', array(
- '%value' => $edit['info[0][value]']
- )));
- $this->assertResponse(200);
- }
-
- /**
- * Create a default custom block.
- *
- * Creates a custom block from defaults and ensures that the 'basic block'
- * type is being used.
- */
- public function testDefaultBlockContentCreation() {
- $edit = array();
- $edit['info[0][value]'] = $this->randomMachineName(8);
- $edit['body[0][value]'] = $this->randomMachineName(16);
- // Don't pass the custom block type in the url so the default is forced.
- $this->drupalPostForm('block/add', $edit, t('Save'));
-
- // Check that the block has been created and that it is a basic block.
- $this->assertRaw(format_string('@block %name has been created.', array(
- '@block' => 'basic',
- '%name' => $edit['info[0][value]'],
- )), 'Basic block created.');
-
- // Check that the block exists in the database.
- $blocks = entity_load_multiple_by_properties('block_content', array('info' => $edit['info[0][value]']));
- $block = reset($blocks);
- $this->assertTrue($block, 'Default Custom Block found in database.');
- }
-
- /**
- * Verifies that a transaction rolls back the failed creation.
- */
- public function testFailedBlockCreation() {
- // Create a block.
- try {
- $this->createBlockContent('fail_creation');
- $this->fail('Expected exception has not been thrown.');
- }
- catch (\Exception $e) {
- $this->pass('Expected exception has been thrown.');
- }
-
- if (Database::getConnection()->supportsTransactions()) {
- // Check that the block does not exist in the database.
- $id = db_select('block_content_field_data', 'b')
- ->fields('b', array('id'))
- ->condition('info', 'fail_creation')
- ->execute()
- ->fetchField();
- $this->assertFalse($id, 'Transactions supported, and block not found in database.');
- }
- else {
- // Check that the block exists in the database.
- $id = db_select('block_content_field_data', 'b')
- ->fields('b', array('id'))
- ->condition('info', 'fail_creation')
- ->execute()
- ->fetchField();
- $this->assertTrue($id, 'Transactions not supported, and block found in database.');
-
- // Check that the failed rollback was logged.
- $records = db_query("SELECT wid FROM {watchdog} WHERE message LIKE 'Explicit rollback failed%'")->fetchAll();
- $this->assertTrue(count($records) > 0, 'Transactions not supported, and rollback error logged to watchdog.');
- }
- }
-
- /**
- * Test deleting a block.
- */
- public function testBlockDelete() {
- // Create a block.
- $edit = array();
- $edit['info[0][value]'] = $this->randomMachineName(8);
- $body = $this->randomMachineName(16);
- $edit['body[0][value]'] = $body;
- $this->drupalPostForm('block/add/basic', $edit, t('Save'));
-
- // Place the block.
- $instance = array(
- 'id' => Unicode::strtolower($edit['info[0][value]']),
- 'settings[label]' => $edit['info[0][value]'],
- 'region' => 'sidebar_first',
- );
- $block = BlockContent::load(1);
- $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . $this->config('system.theme')->get('default');
- $this->drupalPostForm($url, $instance, t('Save block'));
-
- $block = BlockContent::load(1);
-
- // Test getInstances method.
- $this->assertEqual(1, count($block->getInstances()));
-
- // Navigate to home page.
- $this->drupalGet('');
- $this->assertText($body);
-
- // Delete the block.
- $this->drupalGet('block/1/delete');
- $this->assertText(\Drupal::translation()->formatPlural(1, 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instance.'));
-
- $this->drupalPostForm(NULL, array(), 'Delete');
- $this->assertRaw(t('The custom block %name has been deleted.', array('%name' => $edit['info[0][value]'])));
-
- // Create another block and force the plugin cache to flush.
- $edit2 = array();
- $edit2['info[0][value]'] = $this->randomMachineName(8);
- $body2 = $this->randomMachineName(16);
- $edit2['body[0][value]'] = $body2;
- $this->drupalPostForm('block/add/basic', $edit2, t('Save'));
-
- $this->assertNoRaw('Error message');
-
- // Create another block with no instances, and test we don't get a
- // confirmation message about deleting instances.
- $edit3 = array();
- $edit3['info[0][value]'] = $this->randomMachineName(8);
- $body = $this->randomMachineName(16);
- $edit3['body[0][value]'] = $body;
- $this->drupalPostForm('block/add/basic', $edit3, t('Save'));
-
- // Show the delete confirm form.
- $this->drupalGet('block/3/delete');
- $this->assertNoText('This will also remove');
- }
-
- /**
- * Test that placed content blocks create a dependency in the block placement.
- */
- public function testConfigDependencies() {
- $block = $this->createBlockContent();
- // Place the block.
- $block_placement_id = Unicode::strtolower($block->label());
- $instance = array(
- 'id' => $block_placement_id,
- 'settings[label]' => $block->label(),
- 'region' => 'sidebar_first',
- );
- $block = BlockContent::load(1);
- $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . $this->config('system.theme')->get('default');
- $this->drupalPostForm($url, $instance, t('Save block'));
-
- $dependencies = \Drupal::service('config.manager')->findConfigEntityDependentsAsEntities('content', array($block->getConfigDependencyName()));
- $block_placement = reset($dependencies);
- $this->assertEqual($block_placement_id, $block_placement->id(), "The block placement config entity has a dependency on the block content entity.");
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentListTest.php b/core/modules/block_content/src/Tests/BlockContentListTest.php
deleted file mode 100644
index be8ea5e4c..000000000
--- a/core/modules/block_content/src/Tests/BlockContentListTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-drupalLogin($this->drupalCreateUser(array('administer blocks', 'translate configuration')));
- $this->drupalGet('admin/structure/block/block-content');
-
- // Test for the page title.
- $this->assertTitle(t('Custom block library') . ' | Drupal');
-
- // Test for the table.
- $element = $this->xpath('//div[@class="layout-content"]//table');
- $this->assertTrue($element, 'Configuration entity list table found.');
-
- // Test the table header.
- $elements = $this->xpath('//div[@class="layout-content"]//table/thead/tr/th');
- $this->assertEqual(count($elements), 2, 'Correct number of table header cells found.');
-
- // Test the contents of each th cell.
- $expected_items = array(t('Block description'), t('Operations'));
- foreach ($elements as $key => $element) {
- $this->assertEqual($element[0], $expected_items[$key]);
- }
-
- $label = 'Antelope';
- $new_label = 'Albatross';
- // Add a new entity using the operations link.
- $link_text = t('Add custom block');
- $this->assertLink($link_text);
- $this->clickLink($link_text);
- $this->assertResponse(200);
- $edit = array();
- $edit['info[0][value]'] = $label;
- $edit['body[0][value]'] = $this->randomMachineName(16);
- $this->drupalPostForm(NULL, $edit, t('Save'));
-
- // Confirm that once the user returns to the listing, the text of the label
- // (versus elsewhere on the page).
- $this->assertFieldByXpath('//td', $label, 'Label found for added block.');
-
- // Check the number of table row cells.
- $elements = $this->xpath('//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td');
- $this->assertEqual(count($elements), 2, 'Correct number of table row cells found.');
- // Check the contents of each row cell. The first cell contains the label,
- // the second contains the machine name, and the third contains the
- // operations list.
- $this->assertIdentical((string) $elements[0], $label);
-
- // Edit the entity using the operations link.
- $blocks = $this->container
- ->get('entity.manager')
- ->getStorage('block_content')
- ->loadByProperties(array('info' => $label));
- $block = reset($blocks);
- if (!empty($block)) {
- $this->assertLinkByHref('block/' . $block->id());
- $this->clickLink(t('Edit'));
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Edit custom block %label', array('%label' => $label)) . ' | Drupal'));
- $edit = array('info[0][value]' => $new_label);
- $this->drupalPostForm(NULL, $edit, t('Save'));
- }
- else {
- $this->fail('Did not find Albatross block in the database.');
- }
-
- // Confirm that once the user returns to the listing, the text of the label
- // (versus elsewhere on the page).
- $this->assertFieldByXpath('//td', $new_label, 'Label found for updated custom block.');
-
- // Delete the added entity using the operations link.
- $this->assertLinkByHref('block/' . $block->id() . '/delete');
- $delete_text = t('Delete');
- $this->clickLink($delete_text);
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', array('%label' => $new_label)) . ' | Drupal'));
- $this->drupalPostForm(NULL, array(), $delete_text);
-
- // Verify that the text of the label and machine name does not appear in
- // the list (though it may appear elsewhere on the page).
- $this->assertNoFieldByXpath('//td', $new_label, 'No label found for deleted custom block.');
-
- // Confirm that the empty text is displayed.
- $this->assertText(t('There is no Custom block yet.'));
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
deleted file mode 100644
index de0ff3bde..000000000
--- a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-drupalLogin($this->drupalCreateUser(array('administer blocks', 'translate configuration')));
- $this->drupalGet('admin/structure/block/block-content');
-
- // Test for the page title.
- $this->assertTitle(t('Custom block library') . ' | Drupal');
-
- // Test for the exposed filters.
- $this->assertFieldByName('info');
- $this->assertFieldByName('type');
-
- // Test for the table.
- $element = $this->xpath('//div[@class="layout-content"]//table');
- $this->assertTrue($element, 'Views table found.');
-
- // Test the table header.
- $elements = $this->xpath('//div[@class="layout-content"]//table/thead/tr/th');
- $this->assertEqual(count($elements), 4, 'Correct number of table header cells found.');
-
- // Test the contents of each th cell.
- $expected_items = ['Block description', 'Block type', 'Updated', 'Operations'];
- foreach ($elements as $key => $element) {
- if ($element->xpath('a')) {
- $this->assertIdentical(trim((string) $element->xpath('a')[0]), $expected_items[$key]);
- }
- else {
- $this->assertIdentical(trim((string) $element[0]), $expected_items[$key]);
- }
- }
-
- $label = 'Antelope';
- $new_label = 'Albatross';
- // Add a new entity using the operations link.
- $link_text = t('Add custom block');
- $this->assertLink($link_text);
- $this->clickLink($link_text);
- $this->assertResponse(200);
- $edit = array();
- $edit['info[0][value]'] = $label;
- $edit['body[0][value]'] = $this->randomMachineName(16);
- $this->drupalPostForm(NULL, $edit, t('Save'));
-
- // Confirm that once the user returns to the listing, the text of the label
- // (versus elsewhere on the page).
- $this->assertFieldByXpath('//td/a', $label, 'Label found for added block.');
-
- // Check the number of table row cells.
- $elements = $this->xpath('//div[@class="layout-content"]//table/tbody/tr/td');
- $this->assertEqual(count($elements), 4, 'Correct number of table row cells found.');
- // Check the contents of each row cell. The first cell contains the label,
- // the second contains the machine name, and the third contains the
- // operations list.
- $this->assertIdentical((string) $elements[0]->xpath('a')[0], $label);
-
- // Edit the entity using the operations link.
- $blocks = $this->container
- ->get('entity.manager')
- ->getStorage('block_content')
- ->loadByProperties(array('info' => $label));
- $block = reset($blocks);
- if (!empty($block)) {
- $this->assertLinkByHref('block/' . $block->id());
- $this->clickLink(t('Edit'));
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Edit custom block %label', array('%label' => $label)) . ' | Drupal'));
- $edit = array('info[0][value]' => $new_label);
- $this->drupalPostForm(NULL, $edit, t('Save'));
- }
- else {
- $this->fail('Did not find Albatross block in the database.');
- }
-
- // Confirm that once the user returns to the listing, the text of the label
- // (versus elsewhere on the page).
- $this->assertFieldByXpath('//td/a', $new_label, 'Label found for updated custom block.');
-
- // Delete the added entity using the operations link.
- $this->assertLinkByHref('block/' . $block->id() . '/delete');
- $delete_text = t('Delete');
- $this->clickLink($delete_text);
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', array('%label' => $new_label)) . ' | Drupal'));
- $this->drupalPostForm(NULL, array(), $delete_text);
-
- // Verify that the text of the label and machine name does not appear in
- // the list (though it may appear elsewhere on the page).
- $this->assertNoFieldByXpath('//td', $new_label, 'No label found for deleted custom block.');
-
- // Confirm that the empty text is displayed.
- $this->assertText('There are no custom blocks available.');
- $this->assertLink('custom block');
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentPageViewTest.php b/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
deleted file mode 100644
index 46c19cb9b..000000000
--- a/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-drupalLogin($this->adminUser);
- $block = $this->createBlockContent();
-
- // Attempt to view the block.
- $this->drupalGet('block-content/' . $block->id());
-
- // Assert response was '200' and not '403 Access denied'.
- $this->assertResponse('200', 'User was able the view the block');
- $this->drupalGet('');
- $this->assertRaw(t('This block is broken or missing. You may be missing content or you might need to enable the original module.'));
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php b/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
deleted file mode 100644
index 720443d5f..000000000
--- a/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-createBlockContent('initial');
-
- $blocks = array();
- $logs = array();
-
- // Get original block.
- $blocks[] = $block->getRevisionId();
- $logs[] = '';
-
- // Create three revisions.
- $revision_count = 3;
- for ($i = 0; $i < $revision_count; $i++) {
- $block->setNewRevision(TRUE);
- $block->setRevisionLog($this->randomMachineName(32));
- $logs[] = $block->getRevisionLog();
- $block->save();
- $blocks[] = $block->getRevisionId();
- }
-
- $this->blocks = $blocks;
- $this->revisionLogs = $logs;
- }
-
- /**
- * Checks block revision related operations.
- */
- public function testRevisions() {
- $blocks = $this->blocks;
- $logs = $this->revisionLogs;
-
- foreach ($blocks as $delta => $revision_id) {
- // Confirm the correct revision text appears.
- $loaded = entity_revision_load('block_content', $revision_id);
- // Verify revision log is the same.
- $this->assertEqual($loaded->getRevisionLog(), $logs[$delta], format_string('Correct log message found for revision @revision', array(
- '@revision' => $loaded->getRevisionId(),
- )));
- }
-
- // Confirm that this is the default revision.
- $this->assertTrue($loaded->isDefaultRevision(), 'Third block revision is the default one.');
-
- // Make a new revision and set it to not be default.
- // This will create a new revision that is not "front facing".
- // Save this as a non-default revision.
- $loaded->setNewRevision();
- $loaded->isDefaultRevision(FALSE);
- $loaded->body = $this->randomMachineName(8);
- $loaded->save();
-
- $this->drupalGet('block/' . $loaded->id());
- $this->assertNoText($loaded->body->value, 'Revision body text is not present on default version of block.');
-
- // Verify that the non-default revision id is greater than the default
- // revision id.
- $default_revision = BlockContent::load($loaded->id());
- $this->assertTrue($loaded->getRevisionId() > $default_revision->getRevisionId(), 'Revision id is greater than default revision id.');
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentSaveTest.php b/core/modules/block_content/src/Tests/BlockContentSaveTest.php
deleted file mode 100644
index aabf7b67c..000000000
--- a/core/modules/block_content/src/Tests/BlockContentSaveTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-save() for saving content.
- *
- * @group block_content
- */
-class BlockContentSaveTest extends BlockContentTestBase {
-
- /**
- * Modules to enable.
- *
- * @var array
- */
- public static $modules = array('block_content_test');
-
- /**
- * Sets the test up.
- */
- protected function setUp() {
- parent::setUp();
-
- $this->drupalLogin($this->adminUser);
- }
-
- /**
- * Checks whether custom block IDs are saved properly during an import.
- */
- public function testImport() {
- // Custom block ID must be a number that is not in the database.
- $max_id = db_query('SELECT MAX(id) FROM {block_content}')->fetchField();
- $test_id = $max_id + mt_rand(1000, 1000000);
- $info = $this->randomMachineName(8);
- $block_array = array(
- 'info' => $info,
- 'body' => array('value' => $this->randomMachineName(32)),
- 'type' => 'basic',
- 'id' => $test_id
- );
- $block = BlockContent::create($block_array);
- $block->enforceIsNew(TRUE);
- $block->save();
-
- // Verify that block_submit did not wipe the provided id.
- $this->assertEqual($block->id(), $test_id, 'Block imported using provide id');
-
- // Test the import saved.
- $block_by_id = BlockContent::load($test_id);
- $this->assertTrue($block_by_id, 'Custom block load by block ID.');
- $this->assertIdentical($block_by_id->body->value, $block_array['body']['value']);
- }
-
- /**
- * Tests determining changes in hook_block_presave().
- *
- * Verifies the static block load cache is cleared upon save.
- */
- public function testDeterminingChanges() {
- // Initial creation.
- $block = $this->createBlockContent('test_changes');
- $this->assertEqual($block->getChangedTime(), REQUEST_TIME, 'Creating a block sets default "changed" timestamp.');
-
- // Update the block without applying changes.
- $block->save();
- $this->assertEqual($block->label(), 'test_changes', 'No changes have been determined.');
-
- // Apply changes.
- $block->setInfo('updated');
- $block->save();
-
- // The hook implementations block_content_test_block_content_presave() and
- // block_content_test_block_content_update() determine changes and change
- // the title as well as programmatically set the 'changed' timestamp.
- $this->assertEqual($block->label(), 'updated_presave_update', 'Changes have been determined.');
- $this->assertEqual($block->getChangedTime(), 979534800, 'Saving a custom block uses "changed" timestamp set in presave hook.');
-
- // Test the static block load cache to be cleared.
- $block = BlockContent::load($block->id());
- $this->assertEqual($block->label(), 'updated_presave', 'Static cache has been cleared.');
- }
-
- /**
- * Tests saving a block on block insert.
- *
- * This test ensures that a block has been fully saved when
- * hook_block_content_insert() is invoked, so that the block can be saved again
- * in a hook implementation without errors.
- *
- * @see block_test_block_insert()
- */
- public function testBlockContentSaveOnInsert() {
- // block_content_test_block_content_insert() triggers a save on insert if the
- // title equals 'new'.
- $block = $this->createBlockContent('new');
- $this->assertEqual($block->label(), 'BlockContent ' . $block->id(), 'Custom block saved on block insert.');
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentTestBase.php b/core/modules/block_content/src/Tests/BlockContentTestBase.php
index 3794478d5..f277f53d7 100644
--- a/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/BlockContentTestBase.php
@@ -16,6 +16,8 @@ abstract class BlockContentTestBase extends WebTestBase {
/**
* Profile to use.
+ *
+ * @var string
*/
protected $profile = 'testing';
diff --git a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php b/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
deleted file mode 100644
index 7748b37c5..000000000
--- a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
+++ /dev/null
@@ -1,202 +0,0 @@
-entityTypeId = 'block_content';
- $this->bundle = 'basic';
- $this->testLanguageSelector = FALSE;
- parent::setUp();
-
- $this->drupalPlaceBlock('page_title_block');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setupBundle() {
- // Create the basic bundle since it is provided by standard.
- $bundle = BlockContentType::create(array(
- 'id' => $this->bundle,
- 'label' => $this->bundle,
- 'revision' => FALSE
- ));
- $bundle->save();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTranslatorPermissions() {
- return array_merge(parent::getTranslatorPermissions(), array(
- 'translate any entity',
- 'access administration pages',
- 'administer blocks',
- 'administer block_content fields'
- ));
- }
-
- /**
- * Creates a custom block.
- *
- * @param bool|string $title
- * (optional) Title of block. When no value is given uses a random name.
- * Defaults to FALSE.
- * @param bool|string $bundle
- * (optional) Bundle name. When no value is given, defaults to
- * $this->bundle. Defaults to FALSE.
- *
- * @return \Drupal\block_content\Entity\BlockContent
- * Created custom block.
- */
- protected function createBlockContent($title = FALSE, $bundle = FALSE) {
- $title = $title ?: $this->randomMachineName();
- $bundle = $bundle ?: $this->bundle;
- $block_content = BlockContent::create(array(
- 'info' => $title,
- 'type' => $bundle,
- 'langcode' => 'en'
- ));
- $block_content->save();
- return $block_content;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getNewEntityValues($langcode) {
- return array('info' => Unicode::strtolower($this->randomMachineName())) + parent::getNewEntityValues($langcode);
- }
-
- /**
- * Returns an edit array containing the values to be posted.
- */
- protected function getEditValues($values, $langcode, $new = FALSE) {
- $edit = parent::getEditValues($values, $langcode, $new);
- foreach ($edit as $property => $value) {
- if ($property == 'info') {
- $edit['info[0][value]'] = $value;
- unset($edit[$property]);
- }
- }
- return $edit;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function doTestBasicTranslation() {
- parent::doTestBasicTranslation();
-
- // Ensure that a block translation can be created using the same description
- // as in the original language.
- $default_langcode = $this->langcodes[0];
- $values = $this->getNewEntityValues($default_langcode);
- $storage = \Drupal::entityManager()->getStorage($this->entityTypeId);
- /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
- $entity = $storage->create(array('type' => 'basic') + $values);
- $entity->save();
- $entity->addTranslation('it', $values);
-
- try {
- $message = 'Blocks can have translations with the same "info" value.';
- $entity->save();
- $this->pass($message);
- }
- catch (\Exception $e) {
- $this->fail($message);
- }
-
- // Check that the translate operation link is shown.
- $this->drupalGet('admin/structure/block/block-content');
- $this->assertLinkByHref('block/' . $entity->id() . '/translations');
- }
-
- /**
- * Test that no metadata is stored for a disabled bundle.
- */
- public function testDisabledBundle() {
- // Create a bundle that does not have translation enabled.
- $disabled_bundle = $this->randomMachineName();
- $bundle = BlockContentType::create(array(
- 'id' => $disabled_bundle,
- 'label' => $disabled_bundle,
- 'revision' => FALSE
- ));
- $bundle->save();
-
- // Create a block content for each bundle.
- $enabled_block_content = $this->createBlockContent();
- $disabled_block_content = $this->createBlockContent(FALSE, $bundle->id());
-
- // Make sure that only a single row was inserted into the block table.
- $rows = db_query('SELECT * FROM {block_content_field_data} WHERE id = :id', array(':id' => $enabled_block_content->id()))->fetchAll();
- $this->assertEqual(1, count($rows));
- }
-
- /**
- * {@inheritdoc}
- */
- protected function doTestTranslationEdit() {
- $entity = entity_load($this->entityTypeId, $this->entityId, TRUE);
- $languages = $this->container->get('language_manager')->getLanguages();
-
- foreach ($this->langcodes as $langcode) {
- // We only want to test the title for non-english translations.
- if ($langcode != 'en') {
- $options = array('language' => $languages[$langcode]);
- $url = $entity->urlInfo('edit-form', $options);
- $this->drupalGet($url);
-
- $title = t('Edit @type @title [%language translation]', array(
- '@type' => $entity->bundle(),
- '@title' => $entity->getTranslation($langcode)->label(),
- '%language' => $languages[$langcode]->getName(),
- ));
- $this->assertRaw($title);
- }
- }
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
deleted file mode 100644
index a4e3a2175..000000000
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ /dev/null
@@ -1,250 +0,0 @@
-drupalPlaceBlock('page_title_block');
- }
-
- /**
- * Tests creating a block type programmatically and via a form.
- */
- public function testBlockContentTypeCreation() {
- // Log in a test user.
- $this->drupalLogin($this->adminUser);
-
- // Test the page with no block-types.
- $this->drupalGet('block/add');
- $this->assertResponse(200);
- $this->assertText('You have not created any block types yet');
- $this->clickLink('block type creation page');
-
- // Create a block type via the user interface.
- $edit = [
- 'id' => 'foo',
- 'label' => 'title for foo',
- ];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $block_type = BlockContentType::load('foo');
- $this->assertTrue($block_type, 'The new block type has been created.');
-
- $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'foo');
- $this->assertTrue(isset($field_definitions['body']), 'Body field created when using the UI to create block content types.');
-
- // Check that the block type was created in site default language.
- $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
- $this->assertEqual($block_type->language()->getId(), $default_langcode);
-
- // Create block types programmatically.
- $this->createBlockContentType('basic', TRUE);
- $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'basic');
- $this->assertTrue(isset($field_definitions['body']), "Body field for 'basic' block type created when using the testing API to create block content types.");
-
- $this->createBlockContentType('other');
- $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'other');
- $this->assertFalse(isset($field_definitions['body']), "Body field for 'other' block type not created when using the testing API to create block content types.");
-
- $block_type = BlockContentType::load('other');
- $this->assertTrue($block_type, 'The new block type has been created.');
-
- $this->drupalGet('block/add/' . $block_type->id());
- $this->assertResponse(200);
- }
-
- /**
- * Tests editing a block type using the UI.
- */
- public function testBlockContentTypeEditing() {
- $this->drupalPlaceBlock('system_breadcrumb_block');
- // Now create an initial block-type.
- $this->createBlockContentType('basic', TRUE);
-
- $this->drupalLogin($this->adminUser);
- // We need two block types to prevent /block/add redirecting.
- $this->createBlockContentType('other');
-
- $field_definitions = \Drupal::entityManager()->getFieldDefinitions('block_content', 'other');
- $this->assertFalse(isset($field_definitions['body']), 'Body field was not created when using the API to create block content types.');
-
- // Verify that title and body fields are displayed.
- $this->drupalGet('block/add/basic');
- $this->assertRaw('Block description', 'Block info field was found.');
- $this->assertRaw('Body', 'Body field was found.');
-
- // Change the block type name.
- $edit = [
- 'label' => 'Bar',
- ];
- $this->drupalGet('admin/structure/block/block-content/manage/basic');
- $this->assertTitle(format_string('Edit @type custom block type | Drupal', ['@type' => 'basic']));
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $front_page_path = Url::fromRoute('')->toString();
- $this->assertBreadcrumb('admin/structure/block/block-content/manage/basic/fields', [
- $front_page_path => 'Home',
- 'admin/structure/block' => 'Block layout',
- 'admin/structure/block/block-content' => 'Custom block library',
- 'admin/structure/block/block-content/manage/basic' => 'Bar',
- ]);
- \Drupal::entityManager()->clearCachedFieldDefinitions();
-
- $this->drupalGet('block/add');
- $this->assertRaw('Bar', 'New name was displayed.');
- $this->clickLink('Bar');
- $this->assertUrl(\Drupal::url('block_content.add_form', ['block_content_type' => 'basic'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.');
-
- // Remove the body field.
- $this->drupalPostForm('admin/structure/block/block-content/manage/basic/fields/block_content.basic.body/delete', [], t('Delete'));
- // Resave the settings for this type.
- $this->drupalPostForm('admin/structure/block/block-content/manage/basic', [], t('Save'));
- // Check that the body field doesn't exist.
- $this->drupalGet('block/add/basic');
- $this->assertNoRaw('Body', 'Body field was not found.');
- }
-
- /**
- * Tests deleting a block type that still has content.
- */
- public function testBlockContentTypeDeletion() {
- // Now create an initial block-type.
- $this->createBlockContentType('basic', TRUE);
-
- // Create a block type programmatically.
- $type = $this->createBlockContentType('foo');
-
- $this->drupalLogin($this->adminUser);
-
- // Add a new block of this type.
- $block = $this->createBlockContent(FALSE, 'foo');
- // Attempt to delete the block type, which should not be allowed.
- $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
- $this->assertRaw(
- t('%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', ['%label' => $type->label()]),
- 'The block type will not be deleted until all blocks of that type are removed.'
- );
- $this->assertNoText(t('This action cannot be undone.'), 'The block type deletion confirmation form is not available.');
-
- // Delete the block.
- $block->delete();
- // Attempt to delete the block type, which should now be allowed.
- $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
- $this->assertRaw(
- t('Are you sure you want to delete the custom block type %type?', ['%type' => $type->id()]),
- 'The block type is available for deletion.'
- );
- $this->assertText(t('This action cannot be undone.'), 'The custom block type deletion confirmation form is available.');
- }
-
- /**
- * Tests that redirects work as expected when multiple block types exist.
- */
- public function testsBlockContentAddTypes() {
- // Now create an initial block-type.
- $this->createBlockContentType('basic', TRUE);
-
- $this->drupalLogin($this->adminUser);
- // Create two block types programmatically.
- $type = $this->createBlockContentType('foo');
- $type = $this->createBlockContentType('bar');
-
- // Get the custom block storage.
- $storage = $this->container
- ->get('entity.manager')
- ->getStorage('block_content');
-
- // Install all themes.
- \Drupal::service('theme_handler')->install(['bartik', 'seven', 'stark']);
- $theme_settings = $this->config('system.theme');
- foreach (['bartik', 'seven', 'stark'] as $default_theme) {
- // Change the default theme.
- $theme_settings->set('default', $default_theme)->save();
- \Drupal::service('router.builder')->rebuild();
-
- // For each installed theme, go to its block page and test the redirects.
- foreach (['bartik', 'seven', 'stark'] as $theme) {
- // Test that adding a block from the 'place blocks' form sends you to the
- // block configure form.
- $path = $theme == $default_theme ? 'admin/structure/block' : "admin/structure/block/list/$theme";
- $this->drupalGet($path);
- $this->clickLinkPartialName('Place block');
- $this->clickLink(t('Add custom block'));
- // The seven theme has markup inside the link, we cannot use clickLink().
- if ($default_theme == 'seven') {
- $options = $theme != $default_theme ? ['query' => ['theme' => $theme]] : [];
- $this->assertLinkByHref(\Drupal::url('block_content.add_form', ['block_content_type' => 'foo'], $options));
- $this->drupalGet('block/add/foo', $options);
- }
- else {
- $this->clickLink('foo');
- }
- // Create a new block.
- $edit = ['info[0][value]' => $this->randomMachineName(8)];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $blocks = $storage->loadByProperties(['info' => $edit['info[0][value]']]);
- if (!empty($blocks)) {
- $block = reset($blocks);
- $this->assertUrl(\Drupal::url('block.admin_add', ['plugin_id' => 'block_content:' . $block->uuid(), 'theme' => $theme], ['absolute' => TRUE]));
- $this->drupalPostForm(NULL, ['region' => 'content'], t('Save block'));
- $this->assertUrl(\Drupal::url('block.admin_display_theme', ['theme' => $theme], ['absolute' => TRUE, 'query' => ['block-placement' => Html::getClass($edit['info[0][value]'])]]));
- }
- else {
- $this->fail('Could not load created block.');
- }
- }
- }
-
- // Test that adding a block from the 'custom blocks list' doesn't send you
- // to the block configure form.
- $this->drupalGet('admin/structure/block/block-content');
- $this->clickLink(t('Add custom block'));
- $this->clickLink('foo');
- $edit = ['info[0][value]' => $this->randomMachineName(8)];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $blocks = $storage->loadByProperties(['info' => $edit['info[0][value]']]);
- if (!empty($blocks)) {
- $this->assertUrl(\Drupal::url('entity.block_content.collection', [], ['absolute' => TRUE]));
- }
- else {
- $this->fail('Could not load created block.');
- }
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentUpdateTest.php b/core/modules/block_content/src/Tests/BlockContentUpdateTest.php
deleted file mode 100644
index 77c12c653..000000000
--- a/core/modules/block_content/src/Tests/BlockContentUpdateTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-databaseDumpFiles = [
- __DIR__ . '/../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
- ];
- }
-
- /**
- * Tests the revision metadata fields and revision data table additions.
- */
- public function testSimpleUpdates() {
- $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();
- $entity_type = $entity_definition_update_manager->getEntityType('block_content');
- $this->assertNull($entity_type->getRevisionDataTable());
-
- $this->runUpdates();
-
- $post_revision_created = $entity_definition_update_manager->getFieldStorageDefinition('revision_created', 'block_content');
- $post_revision_user = $entity_definition_update_manager->getFieldStorageDefinition('revision_user', 'block_content');
- $this->assertTrue($post_revision_created instanceof BaseFieldDefinition, "Revision created field found");
- $this->assertTrue($post_revision_user instanceof BaseFieldDefinition, "Revision user field found");
-
- $this->assertEqual('created', $post_revision_created->getType(), "Field is type created");
- $this->assertEqual('entity_reference', $post_revision_user->getType(), "Field is type entity_reference");
-
- $entity_type = $entity_definition_update_manager->getEntityType('block_content');
- $this->assertEqual('block_content_field_revision', $entity_type->getRevisionDataTable());
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/BlockContentValidationTest.php b/core/modules/block_content/src/Tests/BlockContentValidationTest.php
deleted file mode 100644
index a0db394c6..000000000
--- a/core/modules/block_content/src/Tests/BlockContentValidationTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-randomMachineName();
- $block = $this->createBlockContent($description, 'basic');
- // Validate the block.
- $violations = $block->validate();
- // Make sure we have no violations.
- $this->assertEqual(count($violations), 0);
- // Save the block.
- $block->save();
-
- // Add another block with the same description.
- $block = $this->createBlockContent($description, 'basic');
- // Validate this block.
- $violations = $block->validate();
- // Make sure we have 1 violation.
- $this->assertEqual(count($violations), 1);
- // Make sure the violation is on the info property
- $this->assertEqual($violations[0]->getPropertyPath(), 'info');
- // Make sure the message is correct.
- $this->assertEqual($violations[0]->getMessage(), format_string('A custom block with block description %value already exists.', [
- '%value' => $block->label(),
- ]));
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/PageEditTest.php b/core/modules/block_content/src/Tests/PageEditTest.php
deleted file mode 100644
index 4a3fb9006..000000000
--- a/core/modules/block_content/src/Tests/PageEditTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-drupalPlaceBlock('page_title_block');
- }
-
- /**
- * Checks block edit functionality.
- */
- public function testPageEdit() {
- $this->drupalLogin($this->adminUser);
-
- $title_key = 'info[0][value]';
- $body_key = 'body[0][value]';
- // Create block to edit.
- $edit = array();
- $edit['info[0][value]'] = Unicode::strtolower($this->randomMachineName(8));
- $edit[$body_key] = $this->randomMachineName(16);
- $this->drupalPostForm('block/add/basic', $edit, t('Save'));
-
- // Check that the block exists in the database.
- $blocks = \Drupal::entityQuery('block_content')->condition('info', $edit['info[0][value]'])->execute();
- $block = BlockContent::load(reset($blocks));
- $this->assertTrue($block, 'Custom block found in database.');
-
- // Load the edit page.
- $this->drupalGet('block/' . $block->id());
- $this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
- $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
-
- // Edit the content of the block.
- $edit = array();
- $edit[$title_key] = $this->randomMachineName(8);
- $edit[$body_key] = $this->randomMachineName(16);
- // Stay on the current page, without reloading.
- $this->drupalPostForm(NULL, $edit, t('Save'));
-
- // Edit the same block, creating a new revision.
- $this->drupalGet("block/" . $block->id());
- $edit = array();
- $edit['info[0][value]'] = $this->randomMachineName(8);
- $edit[$body_key] = $this->randomMachineName(16);
- $edit['revision'] = TRUE;
- $this->drupalPostForm(NULL, $edit, t('Save'));
-
- // Ensure that the block revision has been created.
- \Drupal::entityManager()->getStorage('block_content')->resetCache(array($block->id()));
- $revised_block = BlockContent::load($block->id());
- $this->assertNotIdentical($block->getRevisionId(), $revised_block->getRevisionId(), 'A new revision has been created.');
-
- // Test deleting the block.
- $this->drupalGet("block/" . $revised_block->id());
- $this->clickLink(t('Delete'));
- $this->assertText(format_string('Are you sure you want to delete the custom block @label?', array('@label' => $revised_block->label())));
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php b/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
deleted file mode 100644
index 5a46dddd7..000000000
--- a/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-save();
- ConfigurableLanguage::createFromLangcode('es')->save();
-
- // Make the body field translatable. The info is already translatable by
- // definition.
- $field_storage = FieldStorageConfig::loadByName('block_content', 'body');
- $field_storage->setTranslatable(TRUE);
- $field_storage->save();
-
- // Set up block_content infos.
- $this->blockContentInfos = array(
- 'en' => 'Food in Paris',
- 'es' => 'Comida en Paris',
- 'fr' => 'Nouriture en Paris',
- );
-
- // Create block_content with translations.
- $block_content = $this->createBlockContent(['info' => $this->blockContentInfos['en'], 'langcode' => 'en', 'type' => 'basic', 'body' => [['value' => $this->blockContentInfos['en']]]]);
- foreach (array('es', 'fr') as $langcode) {
- $translation = $block_content->addTranslation($langcode, ['info' => $this->blockContentInfos[$langcode]]);
- $translation->body->value = $this->blockContentInfos[$langcode];
- }
- $block_content->save();
- }
-
- /**
- * Tests body and info filters.
- */
- public function testFilters() {
- // Test the info filter page, which filters for info contains 'Comida'.
- // Should show just the Spanish translation, once.
- $this->assertPageCounts('test-info-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida info filter');
-
- // Test the body filter page, which filters for body contains 'Comida'.
- // Should show just the Spanish translation, once.
- $this->assertPageCounts('test-body-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida body filter');
-
- // Test the info Paris filter page, which filters for info contains
- // 'Paris'. Should show each translation once.
- $this->assertPageCounts('test-info-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris info filter');
-
- // Test the body Paris filter page, which filters for body contains
- // 'Paris'. Should show each translation once.
- $this->assertPageCounts('test-body-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris body filter');
- }
-
- /**
- * Asserts that the given block_content translation counts are correct.
- *
- * @param string $path
- * Path of the page to test.
- * @param array $counts
- * Array whose keys are languages, and values are the number of times
- * that translation should be shown on the given page.
- * @param string $message
- * Message suffix to display.
- */
- protected function assertPageCounts($path, $counts, $message) {
- // Get the text of the page.
- $this->drupalGet($path);
- $text = $this->getTextContent();
-
- foreach ($counts as $langcode => $count) {
- $this->assertEqual(substr_count($text, $this->blockContentInfos[$langcode]), $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
- }
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php b/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
deleted file mode 100644
index d92c5beb4..000000000
--- a/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-createBlockContentType();
- $types[] = $type;
-
- for ($j = 0; $j < 5; $j++) {
- // Ensure the right order of the block_contents.
- $block_content = $this->createBlockContent(array('type' => $type->id()));
- $block_contents[$type->id()][$block_content->id()] = $block_content;
- $all_ids[] = $block_content->id();
- }
- }
-
- $this->drupalGet('test-block_content-view');
- $this->assertResponse(404);
-
- $this->drupalGet('test-block_content-view/all');
- $this->assertResponse(200);
- $this->assertIds($all_ids);
- /* @var \Drupal\block_content\Entity\BlockContentType[] $types*/
- foreach ($types as $type) {
- $this->drupalGet("test-block_content-view/{$type->id()}");
- $this->assertIds(array_keys($block_contents[$type->id()]));
- }
- }
-
- /**
- * Ensures that a list of block_contents appear on the page.
- *
- * @param array $expected_ids
- * An array of block_content IDs.
- */
- protected function assertIds(array $expected_ids = array()) {
- $result = $this->xpath('//span[@class="field-content"]');
- $ids = array();
- foreach ($result as $element) {
- $ids[] = (int) $element;
- }
- $this->assertEqual($ids, $expected_ids);
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/Views/FieldTypeTest.php b/core/modules/block_content/src/Tests/Views/FieldTypeTest.php
deleted file mode 100644
index f14653fea..000000000
--- a/core/modules/block_content/src/Tests/Views/FieldTypeTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-createBlockContent();
- $expected_result[] = array(
- 'id' => $block_content->id(),
- 'type' => $block_content->bundle(),
- );
- $column_map = array(
- 'id' => 'id',
- 'type:target_id' => 'type',
- );
-
- $view = Views::getView('test_field_type');
- $this->executeView($view);
- $this->assertIdenticalResultset($view, $expected_result, $column_map, 'The correct block_content type was displayed.');
- }
-
-}
diff --git a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php b/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
deleted file mode 100644
index 516705d2b..000000000
--- a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
- 'basic',
- 'label' => 'basic',
- 'revision' => TRUE,
- ));
- ViewTestData::createTestViews(get_class($this), array('block_content_test_views'));
- }
-
- /**
- * Create a block_content with revision and rest result count for both views.
- */
- public function testBlockContentRevisionRelationship() {
- $block_content = BlockContent::create(array(
- 'info' => $this->randomMachineName(),
- 'type' => 'basic',
- 'langcode' => 'en',
- ));
- $block_content->save();
- // Create revision of the block_content.
- $block_content_revision = clone $block_content;
- $block_content_revision->setNewRevision();
- $block_content_revision->save();
- $column_map = array(
- 'revision_id' => 'revision_id',
- 'id_1' => 'id_1',
- 'block_content_field_data_block_content_field_revision_id' => 'block_content_field_data_block_content_field_revision_id',
- );
-
- // Here should be two rows.
- $view_id = Views::getView('test_block_content_revision_id');
- $this->executeView($view_id, array($block_content->id()));
- $resultset_id = array(
- array(
- 'revision_id' => '1',
- 'id_1' => '1',
- 'block_content_field_data_block_content_field_revision_id' => '1',
- ),
- array(
- 'revision_id' => '2',
- 'id_1' => '1',
- 'block_content_field_data_block_content_field_revision_id' => '1',
- ),
- );
- $this->assertIdenticalResultset($view_id, $resultset_id, $column_map);
-
- // There should be only one row with active revision 2.
- $view_revision_id = Views::getView('test_block_content_revision_revision_id');
- $this->executeView($view_revision_id, array($block_content->id()));
- $resultset_revision_id = array(
- array(
- 'revision_id' => '2',
- 'id_1' => '1',
- 'block_content_field_data_block_content_field_revision_id' => '1',
- ),
- );
- $this->assertIdenticalResultset($view_revision_id, $resultset_revision_id, $column_map);
- }
-
-}
diff --git a/core/modules/block_content/tests/modules/block_content_test/block_content_test.info.yml b/core/modules/block_content/tests/modules/block_content_test/block_content_test.info.yml
index 08ae437b3..16d7f312d 100644
--- a/core/modules/block_content/tests/modules/block_content_test/block_content_test.info.yml
+++ b/core/modules/block_content/tests/modules/block_content_test/block_content_test.info.yml
@@ -7,8 +7,8 @@ package: Testing
dependencies:
- block_content
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block_content/tests/modules/block_content_test_views/block_content_test_views.info.yml b/core/modules/block_content/tests/modules/block_content_test_views/block_content_test_views.info.yml
index 6cb8de057..d4172552f 100644
--- a/core/modules/block_content/tests/modules/block_content_test_views/block_content_test_views.info.yml
+++ b/core/modules/block_content/tests/modules/block_content_test_views/block_content_test_views.info.yml
@@ -8,8 +8,8 @@ dependencies:
- block_content
- views
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
index fa88c64c2..3218e7fc0 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
@@ -31,7 +31,7 @@ class BlockContentRevisionsTest extends BlockContentTestBase {
protected function setUp() {
parent::setUp();
- /** @var UserInterface $user */
+ /** @var \Drupal\user\Entity\UserInterface $user */
$user = User::load(1);
// Create initial block.
diff --git a/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php b/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
index 45c7e2699..1fdd0ef56 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
@@ -13,6 +13,8 @@ abstract class BlockContentTestBase extends BrowserTestBase {
/**
* Profile to use.
+ *
+ * @var string
*/
protected $profile = 'testing';
diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
index bb5ba89eb..87e6fac89 100644
--- a/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
@@ -37,7 +37,7 @@ class MigrateBlockContentTest extends MigrateDrupal6TestBase {
* Tests the Drupal 6 custom block to Drupal 8 migration.
*/
public function testBlockMigration() {
- /** @var BlockContent $block */
+ /** @var \Drupal\block_content\Entity\BlockContent $block */
$block = BlockContent::load(1);
$this->assertIdentical('My block 1', $block->label());
$this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
diff --git a/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d6/BoxTest.php b/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d6/BoxTest.php
deleted file mode 100644
index bb4a1ac4d..000000000
--- a/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d6/BoxTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
- 'test',
- 'source' => array(
- 'plugin' => 'd6_boxes',
- ),
- );
-
- protected $expectedResults = array(
- array(
- 'bid' => 1,
- 'body' => '');
- foreach ($breadcrumb as $a_node) {
- $expected_breadcrumb[] = $a_node->url();
- }
-
- // Fetch links in the current breadcrumb.
- $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
- $got_breadcrumb = array();
- foreach ($links as $link) {
- $got_breadcrumb[] = (string) $link['href'];
- }
-
- // Compare expected and got breadcrumbs.
- $this->assertIdentical($expected_breadcrumb, $got_breadcrumb, 'The breadcrumb is correctly displayed on the page.');
-
- // Check printer friendly version.
- $this->drupalGet('book/export/html/' . $node->id());
- $this->assertText($node->label(), 'Printer friendly title found.');
- $this->assertRaw($node->body->processed, 'Printer friendly body found.');
-
- $number++;
- }
-
- /**
- * Creates a regular expression to check for the sub-nodes in the outline.
- *
- * @param array $nodes
- * An array of nodes to check in outline.
- *
- * @return string
- * A regular expression that locates sub-nodes of the outline.
- */
- function generateOutlinePattern($nodes) {
- $outline = '';
- foreach ($nodes as $node) {
- $outline .= '(node\/' . $node->id() . ')(.*?)(' . $node->label() . ')(.*?)';
- }
-
- return '/
").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[r]={element:t,tooltip:n}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur"),s=r.element;i.target=i.currentTarget=s[0],t.close(i,!0),e("#"+n).remove(),s.data("ui-tooltip-title")&&(s.attr("title")||s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}})});
\ No newline at end of file
diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 160b526eb..a11eedcbc 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -757,6 +757,16 @@ field.value.float:
type: float
label: 'Value'
+# Schema for the configuration of the Timestamp field type.
+
+field.value.timestamp:
+ type: mapping
+ label: 'Timestamp value'
+ mapping:
+ value:
+ type: timestamp
+ label: 'Value'
+
# Text with a text format.
text_format:
type: mapping
diff --git a/core/core.services.yml b/core/core.services.yml
index 598754e10..81cdb36ae 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -806,6 +806,8 @@ services:
router.route_provider.lazy_builder:
class: Drupal\Core\Routing\RouteProviderLazyBuilder
arguments: ['@router.route_provider', '@router.builder']
+ tags:
+ - { name: event_subscriber }
router.route_preloader:
class: Drupal\Core\Routing\RoutePreloader
arguments: ['@router.route_provider', '@state', '@cache.bootstrap']
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 1d602b2f6..9c1930fd0 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -148,12 +148,13 @@ const LOCALE_PLURAL_DELIMITER = PluralTranslatableMarkup::DELIMITER;
* If the query parameter isn't present, then the URL of the current
* request is returned.
*
- * @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
- *
* @ingroup form_api
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use the redirect.destination service.
+ *
+ * @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
+ * @see https://www.drupal.org/node/2448603
*/
function drupal_get_destination() {
return \Drupal::destination()->getAsArray();
@@ -176,6 +177,8 @@ function drupal_get_destination() {
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use \Drupal::service('email.validator')->isValid().
+ *
+ * @see https://www.drupal.org/node/2912661
*/
function valid_email_address($mail) {
return \Drupal::service('email.validator')->isValid($mail);
@@ -209,9 +212,6 @@ function valid_email_address($mail) {
* Drupal\Core\Template\Attribute, call
* \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() instead.
*
- * @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols()
- * @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
- *
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use UrlHelper::stripDangerousProtocols() or UrlHelper::filterBadProtocol()
* instead. UrlHelper::stripDangerousProtocols() can be used in conjunction
@@ -220,6 +220,10 @@ function valid_email_address($mail) {
* UrlHelper::filterBadProtocol() is functionality equivalent to check_url()
* apart from the fact it is protected from double escaping bugs. Note that
* this method no longer marks its output as safe.
+ *
+ * @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols()
+ * @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
+ * @see https://www.drupal.org/node/2560027
*/
function check_url($uri) {
return Html::escape(UrlHelper::stripDangerousProtocols($uri));
@@ -315,10 +319,11 @@ function format_size($size, $langcode = NULL) {
* @return
* A translated date string in the requested format.
*
- * @see \Drupal\Core\Datetime\DateFormatter::format()
- *
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
* Use \Drupal::service('date.formatter')->format().
+ *
+ * @see \Drupal\Core\Datetime\DateFormatter::format()
+ * @see https://www.drupal.org/node/1876852
*/
function format_date($timestamp, $type = 'medium', $format = '', $timezone = NULL, $langcode = NULL) {
return \Drupal::service('date.formatter')->format($timestamp, $type, $format, $timezone, $langcode);
@@ -420,6 +425,8 @@ function base_path() {
*
* @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
* Use \Drupal\Core\Asset\AssetCollectionOptimizerInterface::deleteAll().
+ *
+ * @see https://www.drupal.org/node/2317841
*/
function drupal_clear_css_cache() {
\Drupal::service('asset.css.collection_optimizer')->deleteAll();
@@ -737,6 +744,8 @@ function drupal_attach_tabledrag(&$element, array $options) {
*
* @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
* Use \Drupal\Core\Asset\AssetCollectionOptimizerInterface::deleteAll().
+ *
+ * @see https://www.drupal.org/node/2317841
*/
function drupal_clear_js_cache() {
\Drupal::service('asset.js.collection_optimizer')->deleteAll();
@@ -854,6 +863,7 @@ function drupal_pre_render_links($element) {
* 'renderer' service instead.
*
* @see \Drupal\Core\Render\RendererInterface::renderRoot()
+ * @see https://www.drupal.org/node/2912696
*/
function drupal_render_root(&$elements) {
return \Drupal::service('renderer')->renderRoot($elements);
@@ -866,6 +876,7 @@ function drupal_render_root(&$elements) {
* 'renderer' service instead.
*
* @see \Drupal\Core\Render\RendererInterface::render()
+ * @see https://www.drupal.org/node/2912696
*/
function drupal_render(&$elements, $is_recursive_call = FALSE) {
return \Drupal::service('renderer')->render($elements, $is_recursive_call);
@@ -889,6 +900,7 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) {
* they are available.
*
* @see drupal_render()
+ * @see https://www.drupal.org/node/2912757
*/
function drupal_render_children(&$element, $children_keys = NULL) {
if ($children_keys === NULL) {
@@ -1002,6 +1014,8 @@ function show(&$element) {
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
* Use \Drupal::service('element_info')->getInfo() instead.
+ *
+ * @see https://www.drupal.org/node/2235461
*/
function element_info($type) {
return \Drupal::service('element_info')->getInfo($type);
@@ -1020,6 +1034,8 @@ function element_info($type) {
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
* Use \Drupal::service('element_info')->getInfoProperty() instead.
+ *
+ * @see https://www.drupal.org/node/2235461
*/
function element_info_property($type, $property_name, $default = NULL) {
return \Drupal::service('element_info')->getInfoProperty($type, $property_name, $default);
@@ -1112,7 +1128,6 @@ function drupal_flush_all_caches() {
// to reset the theme manager.
\Drupal::theme()->resetActiveTheme();
-
// Rebuild and reboot a new kernel. A simple DrupalKernel reboot is not
// sufficient, since the list of enabled modules might have been adjusted
// above due to changed code.
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 0288c8320..b6ab267e4 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -526,7 +526,6 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
$destination = file_build_uri(drupal_basename($source));
}
-
// Prepare the destination directory.
if (file_prepare_directory($destination)) {
// The destination is already a directory, so append the source basename.
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index e5f286cab..6a6075f7d 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -415,6 +415,7 @@ function install_begin_request($class_loader, &$install_state) {
else {
$environment = 'prod';
}
+ $GLOBALS['conf']['container_service_providers']['InstallerConfigOverride'] = 'Drupal\Core\Installer\ConfigOverride';
// Only allow dumping the container once the hash salt has been created.
$kernel = InstallerKernel::createFromRequest($request, $class_loader, $environment, (bool) Settings::get('hash_salt', FALSE));
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 4cc6424f3..68b10b3e4 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -461,7 +461,7 @@ function theme_render_and_autoescape($arg) {
*
* @param array $theme_settings
* An array of theme settings from system setting form or a Drupal 7 variable.
- * @param Config $config
+ * @param \Drupal\Core\Config\Config $config
* The configuration object to update.
*
* @return
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 2caa6ca3f..92e1e54e9 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -83,7 +83,7 @@ function update_system_schema_requirements() {
$requirements['minimum schema'] += [
'value' => 'The installed schema version does not meet the minimum.',
'severity' => REQUIREMENT_ERROR,
- 'description' => 'Your system schema version is ' . $system_schema . '. Updating directly from a schema version prior to 8000 is not supported. You must migrate your site to Drupal 8 first.',
+ 'description' => 'Your system schema version is ' . $system_schema . '. Updating directly from a schema version prior to 8000 is not supported. You must upgrade your site to Drupal 8 first, see https://www.drupal.org/docs/8/upgrade.',
];
}
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index b8f539f1d..bf53eaa11 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -81,7 +81,7 @@ class Drupal {
/**
* The current system version.
*/
- const VERSION = '8.4.2';
+ const VERSION = '8.4.4';
/**
* Core API compatibility.
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 337b41bf4..711eb4c9d 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -23,6 +23,19 @@ use Drupal\Component\Utility\ToStringTrait;
* errors are. This is less disruptive than allowing datetime exceptions
* to abort processing. The calling script can decide what to do about
* errors using hasErrors() and getErrors().
+ *
+ * @method $this add(\DateInterval $interval)
+ * @method static array getLastErrors()
+ * @method $this modify(string $modify)
+ * @method $this setDate(int $year, int $month, int $day)
+ * @method $this setISODate(int $year, int $week, int $day = 1)
+ * @method $this setTime(int $hour, int $minute, int $second = 0, int $microseconds = 0)
+ * @method $this setTimestamp(int $unixtimestamp)
+ * @method $this setTimezone(\DateTimeZone $timezone)
+ * @method $this sub(\DateInterval $interval)
+ * @method int getOffset()
+ * @method int getTimestamp()
+ * @method \DateTimeZone getTimezone()
*/
class DateTimePlus {
@@ -53,31 +66,43 @@ class DateTimePlus {
/**
* The value of the time value passed to the constructor.
+ *
+ * @var string
*/
protected $inputTimeRaw = '';
/**
* The prepared time, without timezone, for this date.
+ *
+ * @var string
*/
protected $inputTimeAdjusted = '';
/**
* The value of the timezone passed to the constructor.
+ *
+ * @var string
*/
protected $inputTimeZoneRaw = '';
/**
* The prepared timezone object used to construct this date.
+ *
+ * @var string
*/
protected $inputTimeZoneAdjusted = '';
/**
* The value of the format passed to the constructor.
+ *
+ * @var string
*/
protected $inputFormatRaw = '';
/**
* The prepared format, if provided.
+ *
+ * @var string
*/
protected $inputFormatAdjusted = '';
diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php
index 45cc8b93e..ac6a6f65d 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -586,8 +586,7 @@ class Container implements ContainerInterface, ResettableContainerInterface {
/**
* Ensure that cloning doesn't work.
*/
- private function __clone()
- {
+ private function __clone() {
}
}
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index c1c3877ed..6c7099085 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -13,7 +13,7 @@ class PoItem {
/**
* The language code this translation is in.
*
- * @car string
+ * @var string
*/
private $_langcode;
@@ -27,7 +27,8 @@ class PoItem {
/**
* The source string or array of strings if it has plurals.
*
- * @var string or array
+ * @var string|array
+ *
* @see $_plural
*/
private $_source;
@@ -49,7 +50,7 @@ class PoItem {
/**
* The translation string or array of strings if it has plurals.
*
- * @var string or array
+ * @var string|array
* @see $_plural
*/
private $_translation;
diff --git a/core/lib/Drupal/Component/PhpStorage/FileStorage.php b/core/lib/Drupal/Component/PhpStorage/FileStorage.php
index e82ec2d6d..63b3cbe3b 100644
--- a/core/lib/Drupal/Component/PhpStorage/FileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/FileStorage.php
@@ -138,34 +138,42 @@ EOF;
* The directory path.
* @param int $mode
* The mode, permissions, the directory should have.
- * @param bool $is_backwards_recursive
- * Internal use only.
*
* @return bool
* TRUE if the directory exists or has been created, FALSE otherwise.
*/
- protected function createDirectory($directory, $mode = 0777, $is_backwards_recursive = FALSE) {
+ protected function createDirectory($directory, $mode = 0777) {
// If the directory exists already, there's nothing to do.
if (is_dir($directory)) {
return TRUE;
}
- // Otherwise, try to create the directory and ensure to set its permissions,
- // because mkdir() obeys the umask of the current process.
- if (is_dir($parent = dirname($directory))) {
- // If the parent directory exists, then the backwards recursion must end,
- // regardless of whether the subdirectory could be created.
- if ($status = mkdir($directory)) {
- // Only try to chmod() if the subdirectory could be created.
- $status = chmod($directory, $mode);
- }
- return $is_backwards_recursive ? TRUE : $status;
+
+ // If the parent directory doesn't exist, try to create it.
+ $parent_exists = is_dir($parent = dirname($directory));
+ if (!$parent_exists) {
+ $parent_exists = $this->createDirectory($parent, $mode);
}
- // If the parent directory and the requested directory does not exist and
- // could not be created above, walk the requested directory path back up
- // until an existing directory is hit, and from there, recursively create
- // the sub-directories. Only if that recursion succeeds, create the final,
- // originally requested subdirectory.
- return $this->createDirectory($parent, $mode, TRUE) && mkdir($directory) && chmod($directory, $mode);
+
+ // If parent exists, try to create the directory and ensure to set its
+ // permissions, because mkdir() obeys the umask of the current process.
+ if ($parent_exists) {
+ // We hide warnings and ignore the return because there may have been a
+ // race getting here and the directory could already exist.
+ @mkdir($directory);
+ // Only try to chmod() if the subdirectory could be created.
+ if (is_dir($directory)) {
+ // Avoid writing permissions if possible.
+ if (fileperms($directory) !== $mode) {
+ return chmod($directory, $mode);
+ }
+ return TRUE;
+ }
+ else {
+ // Something failed and the directory doesn't exist.
+ trigger_error('mkdir(): Permission Denied', E_USER_WARNING);
+ }
+ }
+ return FALSE;
}
/**
diff --git a/core/lib/Drupal/Component/Utility/Unicode.php b/core/lib/Drupal/Component/Utility/Unicode.php
index b222f78bc..f8e026faf 100644
--- a/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/core/lib/Drupal/Component/Utility/Unicode.php
@@ -603,11 +603,13 @@ EOD;
*
* @param string $string
* The header to encode.
+ * @param bool $shorten
+ * If TRUE, only return the first chunk of a multi-chunk encoded string.
*
* @return string
* The mime-encoded header.
*/
- public static function mimeHeaderEncode($string) {
+ public static function mimeHeaderEncode($string, $shorten = FALSE) {
if (preg_match('/[^\x20-\x7E]/', $string)) {
// floor((75 - strlen("=?UTF-8?B??=")) * 0.75);
$chunk_size = 47;
@@ -616,6 +618,9 @@ EOD;
while ($len > 0) {
$chunk = static::truncateBytes($string, $chunk_size);
$output .= ' =?UTF-8?B?' . base64_encode($chunk) . "?=\n";
+ if ($shorten) {
+ break;
+ }
$c = strlen($chunk);
$string = substr($string, $c);
$len -= $c;
diff --git a/core/lib/Drupal/Core/Access/AccessManagerInterface.php b/core/lib/Drupal/Core/Access/AccessManagerInterface.php
index bbb1ec95e..2ea6a6a9c 100644
--- a/core/lib/Drupal/Core/Access/AccessManagerInterface.php
+++ b/core/lib/Drupal/Core/Access/AccessManagerInterface.php
@@ -38,7 +38,7 @@ interface AccessManagerInterface {
/**
* Execute access checks against the incoming request.
*
- * @param Request $request
+ * @param \Symfony\Component\HttpFoundation\Request $request
* The incoming request.
* @param \Drupal\Core\Session\AccountInterface $account
* (optional) Run access checks for this account. Defaults to the current
diff --git a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
index 2b0fcdd26..623d3961b 100644
--- a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
+++ b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
@@ -119,7 +119,7 @@ class OpenDialogCommand implements CommandInterface, CommandWithAttachedAssetsIn
* The new title of the dialog.
*/
public function setDialogTitle($title) {
- $this->setDialogOptions('title', $title);
+ $this->setDialogOption('title', $title);
}
/**
diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextsPass.php b/core/lib/Drupal/Core/Cache/Context/CacheContextsPass.php
index bf49e540e..2025fbbf6 100644
--- a/core/lib/Drupal/Core/Cache/Context/CacheContextsPass.php
+++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsPass.php
@@ -36,7 +36,6 @@ class CacheContextsPass implements CompilerPassInterface {
}
}
-
$container->setParameter('cache_contexts', $cache_contexts);
}
diff --git a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
index 952dc14ad..620787b6b 100644
--- a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
@@ -13,7 +13,7 @@ class LanguagesCacheContext implements CalculatedCacheContextInterface {
/**
* The language manager.
*
- * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+ * @var \Drupal\Core\Language\LanguageManagerInterface
*/
protected $languageManager;
diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php
index 8b3b3d66f..e76668306 100644
--- a/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -292,78 +292,85 @@ class ConfigManager implements ConfigManagerInterface {
* {@inheritdoc}
*/
public function getConfigEntitiesToChangeOnDependencyRemoval($type, array $names, $dry_run = TRUE) {
- // Determine the current list of dependent configuration entities and set up
- // initial values.
$dependency_manager = $this->getConfigDependencyManager();
- $dependents = $this->findConfigEntityDependentsAsEntities($type, $names, $dependency_manager);
- $original_dependencies = $dependents;
- $delete_uuids = [];
+ // Store the list of dependents in three separate variables. This allows us
+ // to determine how the dependency graph changes as entities are fixed by
+ // calling the onDependencyRemoval() method.
+
+ // The list of original dependents on $names. This list never changes.
+ $original_dependents = $this->findConfigEntityDependentsAsEntities($type, $names, $dependency_manager);
+
+ // The current list of dependents on $names. This list is recalculated when
+ // calling an entity's onDependencyRemoval() method results in the entity
+ // changing. This list is passed to each entity's onDependencyRemoval()
+ // method as the list of affected entities.
+ $current_dependents = $original_dependents;
+
+ // The list of dependents to process. This list changes as entities are
+ // processed and are either fixed or deleted.
+ $dependents_to_process = $original_dependents;
+
+ // Initialize other variables.
+ $affected_uuids = [];
$return = [
'update' => [],
'delete' => [],
'unchanged' => [],
];
- // Create a map of UUIDs to $original_dependencies key so that we can remove
- // fixed dependencies.
- $uuid_map = [];
- foreach ($original_dependencies as $key => $entity) {
- $uuid_map[$entity->uuid()] = $key;
- }
-
- // Try to fix any dependencies and find out what will happen to the
- // dependency graph. Entities are processed in the order of most dependent
- // first. For example, this ensures that Menu UI third party dependencies on
- // node types are fixed before processing the node type's other
- // dependencies.
- while ($dependent = array_pop($dependents)) {
+ // Try to fix the dependents and find out what will happen to the dependency
+ // graph. Entities are processed in the order of most dependent first. For
+ // example, this ensures that Menu UI third party dependencies on node types
+ // are fixed before processing the node type's other dependents.
+ while ($dependent = array_pop($dependents_to_process)) {
/** @var \Drupal\Core\Config\Entity\ConfigEntityInterface $dependent */
if ($dry_run) {
// Clone the entity so any changes do not change any static caches.
$dependent = clone $dependent;
}
$fixed = FALSE;
- if ($this->callOnDependencyRemoval($dependent, $original_dependencies, $type, $names)) {
+ if ($this->callOnDependencyRemoval($dependent, $current_dependents, $type, $names)) {
// Recalculate dependencies and update the dependency graph data.
$dependent->calculateDependencies();
$dependency_manager->updateData($dependent->getConfigDependencyName(), $dependent->getDependencies());
- // Based on the updated data rebuild the list of dependents. This will
- // remove entities that are no longer dependent after the recalculation.
- $dependents = $this->findConfigEntityDependentsAsEntities($type, $names, $dependency_manager);
- // Remove any entities that we've already marked for deletion.
- $dependents = array_filter($dependents, function ($dependent) use ($delete_uuids) {
- return !in_array($dependent->uuid(), $delete_uuids);
+ // Based on the updated data rebuild the list of current dependents.
+ // This will remove entities that are no longer dependent after the
+ // recalculation.
+ $current_dependents = $this->findConfigEntityDependentsAsEntities($type, $names, $dependency_manager);
+ // Rebuild the list of entities that we need to process using the new
+ // list of current dependents and removing any entities that we've
+ // already processed.
+ $dependents_to_process = array_filter($current_dependents, function ($current_dependent) use ($affected_uuids) {
+ return !in_array($current_dependent->uuid(), $affected_uuids);
});
- // Ensure that the dependency has actually been fixed. It is possible
- // that the dependent has multiple dependencies that cause it to be in
- // the dependency chain.
+ // Ensure that the dependent has actually been fixed. It is possible
+ // that other dependencies cause it to still be in the list.
$fixed = TRUE;
- foreach ($dependents as $key => $entity) {
+ foreach ($dependents_to_process as $key => $entity) {
if ($entity->uuid() == $dependent->uuid()) {
$fixed = FALSE;
- unset($dependents[$key]);
+ unset($dependents_to_process[$key]);
break;
}
}
if ($fixed) {
- // Remove the fixed dependency from the list of original dependencies.
- unset($original_dependencies[$uuid_map[$dependent->uuid()]]);
+ $affected_uuids[] = $dependent->uuid();
$return['update'][] = $dependent;
}
}
// If the entity cannot be fixed then it has to be deleted.
if (!$fixed) {
- $delete_uuids[] = $dependent->uuid();
+ $affected_uuids[] = $dependent->uuid();
// Deletes should occur in the order of the least dependent first. For
// example, this ensures that fields are removed before field storages.
array_unshift($return['delete'], $dependent);
}
}
- // Use the lists of UUIDs to filter the original list to work out which
- // configuration entities are unchanged.
- $return['unchanged'] = array_filter($original_dependencies, function ($dependent) use ($delete_uuids) {
- return !(in_array($dependent->uuid(), $delete_uuids));
+ // Use the list of affected UUIDs to filter the original list to work out
+ // which configuration entities are unchanged.
+ $return['unchanged'] = array_filter($original_dependents, function ($dependent) use ($affected_uuids) {
+ return !(in_array($dependent->uuid(), $affected_uuids));
});
return $return;
diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
index 8a749a38c..0ac6134c3 100644
--- a/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -159,7 +159,7 @@ class DatabaseStorage implements StorageInterface {
* @throws \Drupal\Core\Config\StorageException
* If a database error occurs.
*/
- protected function ensureTableExists() {
+ protected function ensureTableExists() {
try {
if (!$this->connection->schema()->tableExists($this->table)) {
$this->connection->schema()->createTable($this->table, static::schemaDefinition());
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 62fb13efc..723ba5316 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -445,7 +445,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
* @param bool $is_syncing
* Is the configuration entity being created as part of a config sync.
*
- * @return ConfigEntityInterface
+ * @return \Drupal\Core\Config\ConfigEntityInterface
* The configuration entity.
*
* @see \Drupal\Core\Config\Entity\ConfigEntityStorageInterface::createFromStorageRecord()
diff --git a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
index f87e618b3..cc968825a 100644
--- a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
@@ -219,7 +219,7 @@ class QueryFactory implements QueryFactoryInterface, EventSubscriberInterface {
/**
* Updates configuration entity in the key store.
*
- * @param ConfigCrudEvent $event
+ * @param \Drupal\Core\Config\ConfigCrudEvent $event
* The configuration event.
*/
public function onConfigSave(ConfigCrudEvent $event) {
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index a14a83f07..a7c1496c7 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -124,7 +124,6 @@ class Connection extends DatabaseConnection {
throw $e;
}
-
// Create functions needed by SQLite.
$pdo->sqliteCreateFunction('if', [__CLASS__, 'sqlFunctionIf']);
$pdo->sqliteCreateFunction('greatest', [__CLASS__, 'sqlFunctionGreatest']);
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 27b6a58fb..6e772cd2b 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -19,6 +19,8 @@ class Schema extends DatabaseSchema {
/**
* Override DatabaseSchema::$defaultSchema
+ *
+ * @var string
*/
protected $defaultSchema = 'main';
diff --git a/core/lib/Drupal/Core/Database/Query/Query.php b/core/lib/Drupal/Core/Database/Query/Query.php
index 94f71a5a4..46c8173f4 100644
--- a/core/lib/Drupal/Core/Database/Query/Query.php
+++ b/core/lib/Drupal/Core/Database/Query/Query.php
@@ -48,6 +48,8 @@ abstract class Query implements PlaceholderInterface {
/**
* The placeholder counter.
+ *
+ * @var int
*/
protected $nextPlaceholder = 0;
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index 80533fdfe..61cb39731 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -113,6 +113,8 @@ class Select extends Query implements SelectInterface {
/**
* The FOR UPDATE status
+ *
+ * @var bool
*/
protected $forUpdate = FALSE;
@@ -825,7 +827,6 @@ class Select extends Query implements SelectInterface {
}
$query .= implode(', ', $fields);
-
// FROM - We presume all queries have a FROM, as any query that doesn't won't need the query builder anyway.
$query .= "\nFROM ";
foreach ($this->tables as $table) {
diff --git a/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
index 9082ca805..5a09b89d2 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
@@ -30,6 +30,8 @@ class SelectExtender implements SelectInterface {
/**
* The placeholder counter.
+ *
+ * @var int
*/
protected $placeholder = 0;
diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index 59b15d079..6a91e7279 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -346,6 +346,8 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
* db_query('A')->rightJoin('B') is identical to
* db_query('B')->leftJoin('A'). This functionality has been deprecated
* because SQLite does not support it.
+ *
+ * @see https://www.drupal.org/node/2765249
*/
public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index 80a68f6e5..aafe1756b 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -19,6 +19,8 @@ abstract class Schema implements PlaceholderInterface {
/**
* The placeholder counter.
+ *
+ * @var int
*/
protected $placeholder = 0;
@@ -30,6 +32,8 @@ abstract class Schema implements PlaceholderInterface {
* method.
*
* @see DatabaseSchema::getPrefixInfo()
+ *
+ * @var string
*/
protected $defaultSchema = 'public';
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
index 1578cef15..52e5c2b4b 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
@@ -56,7 +56,6 @@ class BackendCompilerPass implements CompilerPassInterface {
}
}
-
foreach ($container->findTaggedServiceIds('backend_overridable') as $id => $attributes) {
// If the service is already an alias it is not the original backend, so
// we don't want to fallback to other storages any longer.
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 217d4dc78..37ed0e97a 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -676,13 +676,13 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
*
* @param \Exception $e
* An exception
- * @param Request $request
+ * @param \Symfony\Component\HttpFoundation\Request $request
* A Request instance
* @param int $type
* The type of the request (one of HttpKernelInterface::MASTER_REQUEST or
* HttpKernelInterface::SUB_REQUEST)
*
- * @return Response
+ * @return \Symfony\Component\HttpFoundation\Response
* A Response instance
*
* @throws \Exception
@@ -1187,10 +1187,10 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/**
* Attach synthetic values on to kernel.
*
- * @param ContainerInterface $container
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
* Container object
*
- * @return ContainerInterface
+ * @return \Symfony\Component\DependencyInjection\ContainerInterface
*/
protected function attachSynthetic(ContainerInterface $container) {
$persist = [];
@@ -1213,7 +1213,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/**
* Compiles a new service container.
*
- * @return ContainerBuilder The compiled service container
+ * @return \Drupal\Core\DependencyInjection\ContainerBuilder The compiled service container
*/
protected function compileContainer() {
// We are forcing a container build so it is reasonable to assume that the
@@ -1334,7 +1334,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/**
* Gets a new ContainerBuilder instance used to build the service container.
*
- * @return ContainerBuilder
+ * @return \Drupal\Core\DependencyInjection\ContainerBuilder
*/
protected function getContainerBuilder() {
return new ContainerBuilder(new ParameterBag($this->getKernelParameters()));
diff --git a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
index 99335ae29..9d14bed06 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
@@ -33,6 +33,8 @@ class EntityType extends Plugin {
/**
* The group machine name.
+ *
+ * @var string
*/
public $group = 'default';
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 2c62589fa..43db12fd7 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -713,6 +713,12 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
elseif (isset($this->translatableEntityKeys[$key][$this->activeLangcode])) {
unset($this->translatableEntityKeys[$key][$this->activeLangcode]);
}
+ // If the revision identifier field is being populated with the original
+ // value, we need to make sure the "new revision" flag is reset
+ // accordingly.
+ if ($key === 'revision' && $this->getRevisionId() == $this->getLoadedRevisionId()) {
+ $this->newRevision = FALSE;
+ }
}
}
diff --git a/core/lib/Drupal/Core/Entity/EntityChangedInterface.php b/core/lib/Drupal/Core/Entity/EntityChangedInterface.php
index 747571799..2c92b0cf4 100644
--- a/core/lib/Drupal/Core/Entity/EntityChangedInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityChangedInterface.php
@@ -37,6 +37,11 @@ interface EntityChangedInterface {
/**
* Gets the timestamp of the last entity change across all translations.
*
+ * This method will return the highest timestamp across all translations. To
+ * check that no translation is older than in another version of the entity
+ * (e.g. to avoid overwriting newer translations with old data), compare each
+ * translation to the other version individually.
+ *
* @return int
* The timestamp of the last entity save operation across all
* translations.
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index ca106b290..2a3945bff 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -439,7 +439,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
/**
* Determines if a field has options for a given display.
*
- * @param FieldDefinitionInterface $definition
+ * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
* A field definition.
* @return array|null
*/
diff --git a/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/core/lib/Drupal/Core/Entity/EntityFieldManager.php
index d6e70eef7..63c35e974 100644
--- a/core/lib/Drupal/Core/Entity/EntityFieldManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityFieldManager.php
@@ -60,7 +60,7 @@ class EntityFieldManager implements EntityFieldManagerInterface {
* - type: The field type.
* - bundles: The bundles in which the field appears.
*
- * @return array
+ * @var array
*/
protected $fieldMap = [];
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index cd0e06a61..96a75da78 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -52,7 +52,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
/**
* The language manager.
*
- * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+ * @var \Drupal\Core\Language\LanguageManagerInterface
*/
protected $languageManager;
@@ -66,9 +66,9 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
/**
* The EntityViewDisplay objects created for individual field rendering.
*
- * @see \Drupal\Core\Entity\EntityViewBuilder::getSingleFieldDisplay()
+ * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface[]
*
- * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface[]
+ * @see \Drupal\Core\Entity\EntityViewBuilder::getSingleFieldDisplay()
*/
protected $singleFieldDisplays;
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php
index b1fee2a29..28d81ba6e 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php
@@ -18,10 +18,23 @@ class EntityChangedConstraintValidator extends ConstraintValidator {
/** @var \Drupal\Core\Entity\EntityInterface $entity */
if (!$entity->isNew()) {
$saved_entity = \Drupal::entityManager()->getStorage($entity->getEntityTypeId())->loadUnchanged($entity->id());
- // A change to any other translation must add a violation to the current
- // translation because there might be untranslatable shared fields.
- if ($saved_entity && $saved_entity->getChangedTimeAcrossTranslations() > $entity->getChangedTimeAcrossTranslations()) {
- $this->context->addViolation($constraint->message);
+ // Ensure that all the entity translations are the same as or newer
+ // than their current version in the storage in order to avoid
+ // reverting other changes. In fact the entity object that is being
+ // saved might contain an older entity translation when different
+ // translations are being concurrently edited.
+ if ($saved_entity) {
+ $common_translation_languages = array_intersect_key($entity->getTranslationLanguages(), $saved_entity->getTranslationLanguages());
+ foreach (array_keys($common_translation_languages) as $langcode) {
+ // Merely comparing the latest changed timestamps across all
+ // translations is not sufficient since other translations may have
+ // been edited and saved in the meanwhile. Therefore, compare the
+ // changed timestamps of each entity translation individually.
+ if ($saved_entity->getTranslation($langcode)->getChangedTime() > $entity->getTranslation($langcode)->getChangedTime()) {
+ $this->context->addViolation($constraint->message);
+ break;
+ }
+ }
}
}
}
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index d18038134..9797e7bb7 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -204,8 +204,10 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
$current_schema = $this->getSchemaFromStorageDefinition($storage_definition);
$this->processFieldStorageSchema($current_schema);
+ $installed_schema = $this->loadFieldSchemaData($original);
+ $this->processFieldStorageSchema($installed_schema);
- return $current_schema != $this->loadFieldSchemaData($original);
+ return $current_schema != $installed_schema;
}
/**
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index bf4abec5c..41c854ad2 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -287,11 +287,11 @@ use Drupal\node\Entity\NodeType;
* out-of-the-box support for Entity API's revisioning and publishing
* features, which will allow your entity type to be used with Drupal's
* editorial workflow provided by the Content Moderation module.
- * - The 'id' annotation gives the entity type ID, and the 'label' annotation
- * gives the human-readable name of the entity type. If you are defining a
- * content entity type that uses bundles, the 'bundle_label' annotation gives
- * the human-readable name to use for a bundle of this entity type (for
- * example, "Content type" for the Node entity).
+ * - In the annotation, the 'id' property gives the entity type ID, and the
+ * 'label' property gives the human-readable name of the entity type. If you
+ * are defining a content entity type that uses bundles, the 'bundle_label'
+ * property gives the human-readable name to use for a bundle of this entity
+ * type (for example, "Content type" for the Node entity).
* - The annotation will refer to several handler classes, which you will also
* need to define:
* - list_builder: Define a class that extends
@@ -310,16 +310,17 @@ use Drupal\node\Entity\NodeType;
* \Drupal\Core\Entity\EntityViewBuilderInterface (usually extending
* \Drupal\Core\Entity\EntityViewBuilder), to display a single entity.
* - translation: For translatable content entities (if the 'translatable'
- * annotation has value TRUE), define a class that extends
+ * annotation property has value TRUE), define a class that extends
* \Drupal\content_translation\ContentTranslationHandler, to translate
* the content. Configuration translation is handled automatically by the
* Configuration Translation module, without the need of a handler class.
* - access: If your configuration entity has complex permissions, you might
* need an access control handling, implementing
- * \Drupal\Core\Entity\EntityAccessControlHandlerInterface, but most entities
- * can just use the 'admin_permission' annotation instead. Note that if you
- * are creating your own access control handler, you should override the
- * checkAccess() and checkCreateAccess() methods, not access().
+ * \Drupal\Core\Entity\EntityAccessControlHandlerInterface, but most
+ * entities can just use the 'admin_permission' annotation property
+ * instead. Note that if you are creating your own access control handler,
+ * you should override the checkAccess() and checkCreateAccess() methods,
+ * not access().
* - storage: A class implementing
* \Drupal\Core\Entity\EntityStorageInterface. If not specified, content
* entities will use \Drupal\Core\Entity\Sql\SqlContentEntityStorage, and
@@ -352,25 +353,26 @@ use Drupal\node\Entity\NodeType;
* - delete-form: Confirmation form to delete the entity.
* - edit-form: Editing form.
* - Other link types specific to your entity type can also be defined.
- * - If your content entity is fieldable, provide 'field_ui_base_route'
- * annotation, giving the name of the route that the Manage Fields, Manage
- * Display, and Manage Form Display pages from the Field UI module will be
- * attached to. This is usually the bundle settings edit page, or an entity
- * type settings page if there are no bundles.
+ * - If your content entity is fieldable, provide the 'field_ui_base_route'
+ * annotation property, giving the name of the route that the Manage Fields,
+ * Manage Display, and Manage Form Display pages from the Field UI module
+ * will be attached to. This is usually the bundle settings edit page, or an
+ * entity type settings page if there are no bundles.
* - If your content entity has bundles, you will also need to define a second
* plugin to handle the bundles. This plugin is itself a configuration entity
* type, so follow the steps here to define it. The machine name ('id'
- * annotation) of this configuration entity class goes into the
- * 'bundle_entity_type' annotation on the entity type class. For example, for
- * the Node entity, the bundle class is \Drupal\node\Entity\NodeType, whose
- * machine name is 'node_type'. This is the annotation value for
- * 'bundle_entity_type' on the \Drupal\node\Entity\Node class. Also, the
- * bundle config entity type annotation must have a 'bundle_of' entry,
+ * annotation property) of this configuration entity class goes into the
+ * 'bundle_entity_type' annotation property on the entity type class. For
+ * example, for the Node entity, the bundle class is
+ * \Drupal\node\Entity\NodeType, whose machine name is 'node_type'. This is
+ * the annotation property 'bundle_entity_type' on the
+ * \Drupal\node\Entity\Node class. Also, the
+ * bundle config entity type annotation must have a 'bundle_of' property,
* giving the machine name of the entity type it is acting as a bundle for.
* These machine names are considered permanent, they may not be renamed.
- * - Additional annotations can be seen on entity class examples such as
- * \Drupal\node\Entity\Node (content) and \Drupal\user\Entity\Role
- * (configuration). These annotations are documented on
+ * - Additional annotation properties can be seen on entity class examples such
+ * as \Drupal\node\Entity\Node (content) and \Drupal\user\Entity\Role
+ * (configuration). These annotation properties are documented on
* \Drupal\Core\Entity\EntityType.
*
* @section sec_routes Entity routes
@@ -456,8 +458,8 @@ use Drupal\node\Entity\NodeType;
* $storage = $container->get('entity.manager')->getStorage('your_entity_type');
* @endcode
* Here, 'your_entity_type' is the machine name of your entity type ('id'
- * annotation on the entity class), and note that you should use dependency
- * injection to retrieve this object if possible. See the
+ * annotation property on the entity class), and note that you should use
+ * dependency injection to retrieve this object if possible. See the
* @link container Services and Dependency Injection topic @endlink for more
* about how to properly retrieve services.
*
diff --git a/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php b/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
deleted file mode 100644
index 61309c64d..000000000
--- a/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
+++ /dev/null
@@ -1,45 +0,0 @@
-getRequest();
- $result = $event->getControllerResult();
-
- // If this is a render array then we assume that the router went with the
- // generic controller and not one with a format. If the format requested is
- // not HTML though we can also assume that the requested format is invalid
- // so we provide a 406 response.
- if (is_array($result) && $request->getRequestFormat() !== 'html') {
- throw new NotAcceptableHttpException('Not acceptable format: ' . $request->getRequestFormat());
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getSubscribedEvents() {
- $events[KernelEvents::VIEW][] = ['onViewDetect406', -10];
-
- return $events;
- }
-
-}
diff --git a/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
index e948aa584..ea7d29fed 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
@@ -136,7 +136,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
// Ensure the profile is not changing.
if ($install_profile !== $core_extension['profile']) {
- $config_importer->logError($this->t('Cannot change the install profile from %new_profile to %profile once Drupal is installed.', ['%profile' => $install_profile, '%new_profile' => $core_extension['profile']]));
+ $config_importer->logError($this->t('Cannot change the install profile from %profile to %new_profile once Drupal is installed.', ['%profile' => $install_profile, '%new_profile' => $core_extension['profile']]));
}
}
diff --git a/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php
index 289eae09d..2d78d20ec 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php
@@ -37,9 +37,9 @@ class ConfigSnapshotSubscriber implements EventSubscriberInterface {
/**
* Constructs the ConfigSnapshotSubscriber object.
*
- * @param StorageInterface $source_storage
+ * @param \Drupal\Core\Config\StorageInterface $source_storage
* The source storage used to discover configuration changes.
- * @param StorageInterface $snapshot_storage
+ * @param \Drupal\Core\Config\StorageInterface $snapshot_storage
* The snapshot storage used to write configuration changes.
*/
public function __construct(ConfigManagerInterface $config_manager, StorageInterface $source_storage, StorageInterface $snapshot_storage) {
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
deleted file mode 100644
index 4737e8031..000000000
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
+++ /dev/null
@@ -1,245 +0,0 @@
-configFactory = $config_factory;
- }
-
- /**
- * Gets the configured error level.
- *
- * @return string
- */
- protected function getErrorLevel() {
- if (!isset($this->errorLevel)) {
- $this->errorLevel = $this->configFactory->get('system.logging')->get('error_level');
- }
- return $this->errorLevel;
- }
-
- /**
- * Handles any exception as a generic error page for HTML.
- *
- * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
- * The event to process.
- */
- protected function onHtml(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
- $error = Error::decodeException($exception);
-
- // Display the message if the current error reporting level allows this type
- // of message to be displayed, and unconditionally in update.php.
- $message = '';
- if (error_displayable($error)) {
- // If error type is 'User notice' then treat it as debug information
- // instead of an error message.
- // @see debug()
- if ($error['%type'] == 'User notice') {
- $error['%type'] = 'Debug';
- }
-
- // Attempt to reduce verbosity by removing DRUPAL_ROOT from the file path
- // in the message. This does not happen for (false) security.
- $root_length = strlen(DRUPAL_ROOT);
- if (substr($error['%file'], 0, $root_length) == DRUPAL_ROOT) {
- $error['%file'] = substr($error['%file'], $root_length + 1);
- }
-
- unset($error['backtrace']);
-
- if ($this->getErrorLevel() != ERROR_REPORTING_DISPLAY_VERBOSE) {
- // Without verbose logging, use a simple message.
-
- // We call SafeMarkup::format directly here, rather than use t() since
- // we are in the middle of error handling, and we don't want t() to
- // cause further errors.
- $message = SafeMarkup::format('%type: @message in %function (line %line of %file).', $error);
- }
- else {
- // With verbose logging, we will also include a backtrace.
-
- $backtrace_exception = $exception;
- while ($backtrace_exception->getPrevious()) {
- $backtrace_exception = $backtrace_exception->getPrevious();
- }
- $backtrace = $backtrace_exception->getTrace();
- // First trace is the error itself, already contained in the message.
- // While the second trace is the error source and also contained in the
- // message, the message doesn't contain argument values, so we output it
- // once more in the backtrace.
- array_shift($backtrace);
-
- // Generate a backtrace containing only scalar argument values.
- $error['@backtrace'] = Error::formatBacktrace($backtrace);
- $message = SafeMarkup::format('%type: @message in %function (line %line of %file). 
assertRaw("Second example feed item title.");
- $this->assertText('Long link feed item title');
- $this->assertText('Long link feed item description');
- $this->assertLinkByHref('http://example.com/tomorrow/and/tomorrow/and/tomorrow/creeps/in/this/petty/pace/from/day/to/day/to/the/last/syllable/of/recorded/time/and/all/our/yesterdays/have/lighted/fools/the/way/to/dusty/death/out/out/brief/candle/life/is/but/a/walking/shadow/a/poor/player/that/struts/and/frets/his/hour/upon/the/stage/and/is/heard/no/more/it/is/a/tale/told/by/an/idiot/full/of/sound/and/fury/signifying/nothing');
- $this->assertText('Long author feed item title');
- $this->assertText('Long author feed item description');
- $this->assertLinkByHref('http://example.com/long/author');
- }
-
- /**
- * Tests a feed that uses the Atom format.
- */
- public function testAtomSample() {
- $feed = $this->createFeed($this->getAtomSample());
- $feed->refreshItems();
- $this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
- $this->assertText('Atom-Powered Robots Run Amok');
- $this->assertLinkByHref('http://example.org/2003/12/13/atom03');
- $this->assertText('Some text.');
- $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a', db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(':link' => 'http://example.org/2003/12/13/atom03'))->fetchField(), 'Atom entry id element is parsed correctly.');
-
- // Check for second feed entry.
- $this->assertText('We tried to stop them, but we failed.');
- $this->assertLinkByHref('http://example.org/2003/12/14/atom03');
- $this->assertText('Some other text.');
- $db_guid = db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(
- ':link' => 'http://example.org/2003/12/14/atom03',
- ))->fetchField();
- $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-bbbb-80da344efa6a', $db_guid, 'Atom entry id element is parsed correctly.');
- }
-
- /**
- * Tests a feed that uses HTML entities in item titles.
- */
- public function testHtmlEntitiesSample() {
- $feed = $this->createFeed($this->getHtmlEntitiesSample());
- $feed->refreshItems();
- $this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
- $this->assertRaw("Quote" Amp&");
- }
-
- /**
- * Tests that a redirected feed is tracked to its target.
- */
- public function testRedirectFeed() {
- $redirect_url = Url::fromRoute('aggregator_test.redirect')->setAbsolute()->toString();
- $feed = Feed::create(array('url' => $redirect_url, 'title' => $this->randomMachineName()));
- $feed->save();
- $feed->refreshItems();
-
- // Make sure that the feed URL was updated correctly.
- $this->assertEqual($feed->getUrl(), \Drupal::url('aggregator_test.feed', array(), array('absolute' => TRUE)));
- }
-
- /**
- * Tests error handling when an invalid feed is added.
- */
- public function testInvalidFeed() {
- // Simulate a typo in the URL to force a curl exception.
- $invalid_url = 'http:/www.drupal.org';
- $feed = Feed::create(array('url' => $invalid_url, 'title' => $this->randomMachineName()));
- $feed->save();
-
- // Update the feed. Use the UI to be able to check the message easily.
- $this->drupalGet('admin/config/services/aggregator');
- $this->clickLink(t('Update items'));
- $this->assertRaw(t('The feed from %title seems to be broken because of error', array('%title' => $feed->label())));
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php b/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
deleted file mode 100644
index 8a7ade05a..000000000
--- a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-enableTestPlugins();
- // Create some nodes.
- $this->createSampleNodes();
- }
-
- /**
- * Test processing functionality.
- */
- public function testProcess() {
- $feed = $this->createFeed();
- $this->updateFeedItems($feed);
- foreach ($feed->items as $iid) {
- $item = Item::load($iid);
- $this->assertTrue(strpos($item->label(), 'testProcessor') === 0);
- }
- }
-
- /**
- * Test deleting functionality.
- */
- public function testDelete() {
- $feed = $this->createFeed();
- $description = $feed->description->value ?: '';
- $this->updateAndDelete($feed, NULL);
- // Make sure the feed title is changed.
- $entities = entity_load_multiple_by_properties('aggregator_feed', array('description' => $description));
- $this->assertTrue(empty($entities));
- }
-
- /**
- * Test post-processing functionality.
- */
- public function testPostProcess() {
- $feed = $this->createFeed(NULL, array('refresh' => 1800));
- $this->updateFeedItems($feed);
- $feed_id = $feed->id();
- // Reset entity cache manually.
- \Drupal::entityManager()->getStorage('aggregator_feed')->resetCache(array($feed_id));
- // Reload the feed to get new values.
- $feed = Feed::load($feed_id);
- // Make sure its refresh rate doubled.
- $this->assertEqual($feed->getRefreshRate(), 3600);
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
deleted file mode 100644
index 1f1e90d40..000000000
--- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content', 'administer blocks'));
- $this->drupalLogin($admin_user);
- }
-
- /**
- * Opens OPML import form.
- */
- public function openImportForm() {
- // Enable the help block.
- $this->drupalPlaceBlock('help_block', array('region' => 'help'));
-
- $this->drupalGet('admin/config/services/aggregator/add/opml');
- $this->assertText('A single OPML document may contain many feeds.', 'Found OPML help text.');
- $this->assertField('files[upload]', 'Found file upload field.');
- $this->assertField('remote', 'Found Remote URL field.');
- $this->assertField('refresh', '', 'Found Refresh field.');
- }
-
- /**
- * Submits form filled with invalid fields.
- */
- public function validateImportFormFields() {
- $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-
- $edit = array();
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertRaw(t('Either upload a file or enter a URL.'), 'Error if no fields are filled.');
-
- $path = $this->getEmptyOpml();
- $edit = array(
- 'files[upload]' => $path,
- 'remote' => file_create_url($path),
- );
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertRaw(t('Either upload a file or enter a URL.'), 'Error if both fields are filled.');
-
- $edit = array('remote' => 'invalidUrl://empty');
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertText(t('The URL invalidUrl://empty is not valid.'), 'Error if the URL is invalid.');
-
- $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
- $this->assertEqual($before, $after, 'No feeds were added during the three last form submissions.');
- }
-
- /**
- * Submits form with invalid, empty, and valid OPML files.
- */
- protected function submitImportForm() {
- $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-
- $form['files[upload]'] = $this->getInvalidOpml();
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $form, t('Import'));
- $this->assertText(t('No new feed has been added.'), 'Attempting to upload invalid XML.');
-
- $edit = array('remote' => file_create_url($this->getEmptyOpml()));
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertText(t('No new feed has been added.'), 'Attempting to load empty OPML from remote URL.');
-
- $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
- $this->assertEqual($before, $after, 'No feeds were added during the two last form submissions.');
-
- db_delete('aggregator_feed')->execute();
-
- $feeds[0] = $this->getFeedEditArray();
- $feeds[1] = $this->getFeedEditArray();
- $feeds[2] = $this->getFeedEditArray();
- $edit = array(
- 'files[upload]' => $this->getValidOpml($feeds),
- 'refresh' => '900',
- );
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertRaw(t('A feed with the URL %url already exists.', array('%url' => $feeds[0]['url[0][value]'])), 'Verifying that a duplicate URL was identified');
- $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title[0][value]'])), 'Verifying that a duplicate title was identified');
-
- $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
- $this->assertEqual($after, 2, 'Verifying that two distinct feeds were added.');
-
- $feeds_from_db = db_query("SELECT title, url, refresh FROM {aggregator_feed}");
- $refresh = TRUE;
- foreach ($feeds_from_db as $feed) {
- $title[$feed->url] = $feed->title;
- $url[$feed->title] = $feed->url;
- $refresh = $refresh && $feed->refresh == 900;
- }
-
- $this->assertEqual($title[$feeds[0]['url[0][value]']], $feeds[0]['title[0][value]'], 'First feed was added correctly.');
- $this->assertEqual($url[$feeds[1]['title[0][value]']], $feeds[1]['url[0][value]'], 'Second feed was added correctly.');
- $this->assertTrue($refresh, 'Refresh times are correct.');
- }
-
- /**
- * Tests the import of an OPML file.
- */
- public function testOpmlImport() {
- $this->openImportForm();
- $this->validateImportFormFields();
- $this->submitImportForm();
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php b/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
deleted file mode 100644
index 1986ceaf5..000000000
--- a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-grantPermission('access news feeds');
- $user_role->save();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function createEntity() {
- // Create a "Camelids" feed.
- $feed = Feed::create(array(
- 'title' => 'Camelids',
- 'url' => 'https://groups.drupal.org/not_used/167169',
- 'refresh' => 900,
- 'checked' => 1389919932,
- 'description' => 'Drupal Core Group feed',
- ));
- $feed->save();
-
- // Create a "Llama" aggregator feed item.
- $item = Item::create(array(
- 'fid' => $feed->id(),
- 'title' => t('Llama'),
- 'path' => 'https://www.drupal.org/',
- ));
- $item->save();
-
- return $item;
- }
-
- /**
- * Tests that when creating a feed item, the feed tag is invalidated.
- */
- public function testEntityCreation() {
- // Create a cache entry that is tagged with a feed cache tag.
- \Drupal::cache('render')->set('foo', 'bar', CacheBackendInterface::CACHE_PERMANENT, $this->entity->getCacheTags());
-
- // Verify a cache hit.
- $this->verifyRenderCache('foo', array('aggregator_feed:1'));
-
- // Now create a feed item in that feed.
- Item::create(array(
- 'fid' => $this->entity->getFeedId(),
- 'title' => t('Llama 2'),
- 'path' => 'https://groups.drupal.org/',
- ))->save();
-
- // Verify a cache miss.
- $this->assertFalse(\Drupal::cache('render')->get('foo'), 'Creating a new feed item invalidates the cache tag of the feed.');
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php b/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php
deleted file mode 100644
index 374a38e89..000000000
--- a/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-databaseDumpFiles = [
- __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
- ];
- }
-
- /**
- * Tests that the 'Source feed' field is required.
- *
- * @see aggregator_update_8200()
- */
- public function testSourceFeedRequired() {
- // Check that the 'fid' field is not required prior to the update.
- $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('fid', 'aggregator_item');
- $this->assertFalse($field_definition->isRequired());
-
- // Run updates.
- $this->runUpdates();
-
- // Check that the 'fid' field is now required.
- $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('fid', 'aggregator_item');
- $this->assertTrue($field_definition->isRequired());
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
deleted file mode 100644
index c1c3df907..000000000
--- a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-createSampleNodes();
-
- // Create a feed and test updating feed items if possible.
- $feed = $this->createFeed();
- if (!empty($feed)) {
- $this->updateFeedItems($feed, $this->getDefaultFeedItemCount());
- $this->deleteFeedItems($feed);
- }
-
- // Delete feed.
- $this->deleteFeed($feed);
-
- // Test updating feed items without valid timestamp information.
- $edit = array(
- 'title[0][value]' => "Feed without publish timestamp",
- 'url[0][value]' => $this->getRSS091Sample(),
- );
-
- $this->drupalGet($edit['url[0][value]']);
- $this->assertResponse(200);
-
- $this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
- $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title[0][value]'])), format_string('The feed @name has been added.', array('@name' => $edit['title[0][value]'])));
-
- $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE url = :url", array(':url' => $edit['url[0][value]']))->fetchField();
- $feed = Feed::load($fid);
-
- $feed->refreshItems();
- $before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
-
- // Sleep for 3 second.
- sleep(3);
- db_update('aggregator_feed')
- ->condition('fid', $feed->id())
- ->fields(array(
- 'checked' => 0,
- 'hash' => '',
- 'etag' => '',
- 'modified' => 0,
- ))
- ->execute();
- $feed->refreshItems();
-
- $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
- $this->assertTrue($before === $after, format_string('Publish timestamp of feed item was not updated (@before === @after)', array('@before' => $before, '@after' => $after)));
-
- // Make sure updating items works even after uninstalling a module
- // that provides the selected plugins.
- $this->enableTestPlugins();
- $this->container->get('module_installer')->uninstall(array('aggregator_test'));
- $this->updateFeedItems($feed);
- $this->assertResponse(200);
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/UpdateFeedTest.php b/core/modules/aggregator/src/Tests/UpdateFeedTest.php
deleted file mode 100644
index 6bfb0f156..000000000
--- a/core/modules/aggregator/src/Tests/UpdateFeedTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-createFeed();
-
- // Get new feed data array and modify newly created feed.
- $edit = $this->getFeedEditArray();
- // Change refresh value.
- $edit['refresh'] = 1800;
- if (isset($feed->{$same_field}->value)) {
- $edit[$same_field] = $feed->{$same_field}->value;
- }
- $this->drupalPostForm('aggregator/sources/' . $feed->id() . '/configure', $edit, t('Save'));
- $this->assertRaw(t('The feed %name has been updated.', array('%name' => $edit['title[0][value]'])), format_string('The feed %name has been updated.', array('%name' => $edit['title[0][value]'])));
-
- // Check feed data.
- $this->assertUrl($feed->url('canonical', ['absolute' => TRUE]));
- $this->assertTrue($this->uniqueFeed($edit['title[0][value]'], $edit['url[0][value]']), 'The feed is unique.');
-
- // Check feed source.
- $this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, 'Feed source exists.');
- $this->assertText($edit['title[0][value]'], 'Page title');
-
- // Set correct title so deleteFeed() will work.
- $feed->title = $edit['title[0][value]'];
-
- // Delete feed.
- $this->deleteFeed($feed);
- }
- }
-
-}
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml
index 1c4980a0f..8c1dbdd78 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml
@@ -5,8 +5,8 @@ package: Testing
# version: VERSION
# core: 8.x
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml
index 8ef9b4cb1..5fb2f155c 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml
@@ -8,8 +8,8 @@ dependencies:
- aggregator
- views
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php b/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
index 9d659d018..64bdb8e01 100644
--- a/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
@@ -38,4 +38,21 @@ class AggregatorUpdateTest extends UpdatePathTestBase {
$this->assertTrue($field_definition->isRequired());
}
+ /**
+ * Tests that the 'Update interval' field has a default value.
+ */
+ public function testUpdateIntervalDefaultValue() {
+ // Check that the 'refresh' field does not have a default value prior to the
+ // update.
+ $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('refresh', 'aggregator_feed');
+ $this->assertSame([], $field_definition->getDefaultValueLiteral());
+
+ // Run updates.
+ $this->runUpdates();
+
+ // Check that the 'refresh' has a default value now.
+ $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('refresh', 'aggregator_feed');
+ $this->assertSame([['value' => 3600]], $field_definition->getDefaultValueLiteral());
+ }
+
}
diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
index 926723702..56c0339bd 100644
--- a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -109,5 +109,6 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
namespace Drupal\Core\Form;
if (!function_exists('drupal_set_message')) {
- function drupal_set_message() {}
+ function drupal_set_message() {
+ }
}
diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/AggregatorItemTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/AggregatorItemTest.php
deleted file mode 100644
index edae6d673..000000000
--- a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/AggregatorItemTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
- 'test',
- 'source' => array(
- 'plugin' => 'aggregator_item',
- ),
- );
-
- protected $expectedResults = array(
- array(
- 'iid' => 1,
- 'fid' => 1,
- 'title' => 'This (three) weeks in Drupal Core - January 10th 2014',
- 'link' => 'https://groups.drupal.org/node/395218',
- 'author' => 'larowlan',
- 'description' => "'));
- $this->assertSessionCookieExists(FALSE);
- $this->assertBigPipeNoJsCookieExists(FALSE);
- $this->assertNoRaw('');
- $this->assertNoRaw($no_js_to_js_markup);
- $this->assertBigPipeNoJsMetaRefreshRedirect();
- $this->assertBigPipeNoJsCookieExists(TRUE);
- $this->assertNoRaw('');
- $this->assertNoRaw($no_js_to_js_markup);
- $this->assertBigPipeNoJsMetaRefreshRedirect();
- $this->assertBigPipeNoJsCookieExists(TRUE);
- $this->assertNoRaw('
', format_string('Contextual link placeholder with id @id exists.', ['@id' => $cached_id]));
-
- // Get server-rendered contextual links.
- // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
- $post = ['ids[0]' => $id, 'ids[1]' => $cached_id];
- $response = $this->drupalPostWithFormat('contextual/render', 'json', $post, ['query' => ['destination' => 'test-page']]);
- $this->assertResponse(200);
- $json = Json::decode($response);
- $this->assertIdentical($json[$id], '');
- $this->assertIdentical($json[$cached_id], '');
- }
-
-}
diff --git a/core/modules/block/tests/modules/block_test/block_test.info.yml b/core/modules/block/tests/modules/block_test/block_test.info.yml
index f00962240..4dbf55c8d 100644
--- a/core/modules/block/tests/modules/block_test/block_test.info.yml
+++ b/core/modules/block/tests/modules/block_test/block_test.info.yml
@@ -7,8 +7,8 @@ package: Testing
dependencies:
- block
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml b/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml
index f1fb99824..b85e476f8 100644
--- a/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml
+++ b/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml
@@ -6,8 +6,8 @@ regions:
content: Content
help: Help
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml b/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
index 8b73deeba..236bde8f1 100644
--- a/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
+++ b/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
@@ -15,8 +15,8 @@ regions_hidden:
- sidebar_first
- sidebar_second
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml b/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml
index 67270e8e7..09b613359 100644
--- a/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml
+++ b/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml
@@ -8,8 +8,8 @@ dependencies:
- block
- views
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php b/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
index 5cea220f6..b64f7c1ba 100644
--- a/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
+++ b/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
@@ -78,10 +78,10 @@ class BlockFilterTest extends JavascriptTestBase {
/**
* Removes any non-visible elements from the passed array.
*
- * @param NodeElement[] $elements
+ * @param \Behat\Mink\Element\NodeElement[] $elements
* An array of node elements.
*
- * @return NodeElement[]
+ * @return \Behat\Mink\Element\NodeElement[]
*/
protected function filterVisibleElements(array $elements) {
$elements = array_filter($elements, function (NodeElement $element) {
diff --git a/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php b/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php
deleted file mode 100644
index 4a60bd19a..000000000
--- a/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
- 'test',
- 'source' => array(
- 'plugin' => 'block',
- ),
- );
-
- /**
- * Sample block instance query results from the source.
- */
- protected $expectedResults = array(
- array(
- 'bid' => 1,
- 'module' => 'block',
- 'delta' => '1',
- 'theme' => 'garland',
- 'status' => 1,
- 'weight' => 0,
- 'region' => 'left',
- 'visibility' => 0,
- 'pages' => '',
- 'title' => 'Test Title 01',
- 'cache' => -1,
- 'roles' => [2]
- ),
- array(
- 'bid' => 2,
- 'module' => 'block',
- 'delta' => '2',
- 'theme' => 'garland',
- 'status' => 1,
- 'weight' => 5,
- 'region' => 'right',
- 'visibility' => 0,
- 'pages' => '@backtrace', $error); - } - } - - $content = $this->t('The website encountered an unexpected error. Please try again later.'); - $content .= $message ? '' . $message : ''; - $response = new Response($content, 500); - - if ($exception instanceof HttpExceptionInterface) { - $response->setStatusCode($exception->getStatusCode()); - $response->headers->add($exception->getHeaders()); - } - else { - $response->setStatusCode(Response::HTTP_INTERNAL_SERVER_ERROR, '500 Service unavailable (with message)'); - } - - $event->setResponse($response); - } - - /** - * Handles any exception as a generic error page for JSON. - * - * @todo This should probably check the error reporting level. - * - * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event - * The event to process. - */ - protected function onJson(GetResponseForExceptionEvent $event) { - $exception = $event->getException(); - $error = Error::decodeException($exception); - - // Display the message if the current error reporting level allows this type - // of message to be displayed, - $data = NULL; - if (error_displayable($error) && $message = $exception->getMessage()) { - $data = ['message' => sprintf('A fatal error occurred: %s', $message)]; - } - - $response = new JsonResponse($data, Response::HTTP_INTERNAL_SERVER_ERROR); - if ($exception instanceof HttpExceptionInterface) { - $response->setStatusCode($exception->getStatusCode()); - $response->headers->add($exception->getHeaders()); - } - - $event->setResponse($response); - } - - /** - * Handles an HttpExceptionInterface exception for unknown formats. - * - * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event - * The event to process. - */ - protected function onFormatUnknown(GetResponseForExceptionEvent $event) { - /** @var \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface|\Exception $exception */ - $exception = $event->getException(); - - $response = new Response($exception->getMessage(), $exception->getStatusCode(), $exception->getHeaders()); - $event->setResponse($response); - } - - /** - * Handles errors for this subscriber. - * - * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event - * The event to process. - */ - public function onException(GetResponseForExceptionEvent $event) { - $format = $this->getFormat($event->getRequest()); - $exception = $event->getException(); - - $method = 'on' . $format; - if (!method_exists($this, $method)) { - if ($exception instanceof HttpExceptionInterface) { - $this->onFormatUnknown($event); - $response = $event->getResponse(); - $response->headers->set('Content-Type', 'text/plain'); - } - else { - $this->onHtml($event); - } - } - else { - $this->$method($event); - } - } - - /** - * Gets the error-relevant format from the request. - * - * @param \Symfony\Component\HttpFoundation\Request $request - * The request object. - * - * @return string - * The format as which to treat the exception. - */ - protected function getFormat(Request $request) { - $format = $request->query->get(MainContentViewSubscriber::WRAPPER_FORMAT, $request->getRequestFormat()); - - // These are all JSON errors for our purposes. Any special handling for - // them can/should happen in earlier listeners if desired. - if (in_array($format, ['drupal_modal', 'drupal_dialog', 'drupal_ajax'])) { - $format = 'json'; - } - - // Make an educated guess that any Accept header type that includes "json" - // can probably handle a generic JSON response for errors. As above, for - // any format this doesn't catch or that wants custom handling should - // register its own exception listener. - foreach ($request->getAcceptableContentTypes() as $mime) { - if (strpos($mime, 'html') === FALSE && strpos($mime, 'json') !== FALSE) { - $format = 'json'; - } - } - - return $format; - } - - /** - * Registers the methods in this class that should be listeners. - * - * @return array - * An array of event listener definitions. - */ - public static function getSubscribedEvents() { - $events[KernelEvents::EXCEPTION][] = ['onException', -256]; - return $events; - } - -} diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php index 10fabd412..87924987c 100644 --- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php +++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php @@ -194,6 +194,17 @@ class ModuleInstaller implements ModuleInstallerInterface { // Update the kernel to include it. $this->updateKernel($module_filenames); + // Replace the route provider service with a version that will rebuild + // if routes used during installation. This ensures that a module's + // routes are available during installation. This has to occur before + // any services that depend on it are instantiated otherwise those + // services will have the old route provider injected. Note that, since + // the container is rebuilt by updating the kernel, the route provider + // service is the regular one even though we are in a loop and might + // have replaced it before. + \Drupal::getContainer()->set('router.route_provider.old', \Drupal::service('router.route_provider')); + \Drupal::getContainer()->set('router.route_provider', \Drupal::service('router.route_provider.lazy_builder')); + // Allow modules to react prior to the installation of a module. $this->moduleHandler->invokeAll('module_preinstall', [$module]); @@ -283,10 +294,6 @@ class ModuleInstaller implements ModuleInstallerInterface { // @see https://www.drupal.org/node/2208429 \Drupal::service('theme_handler')->refreshInfo(); - // In order to make uninstalling transactional if anything uses routes. - \Drupal::getContainer()->set('router.route_provider.old', \Drupal::service('router.route_provider')); - \Drupal::getContainer()->set('router.route_provider', \Drupal::service('router.route_provider.lazy_builder')); - // Allow the module to perform install tasks. $this->moduleHandler->invoke($module, 'install'); @@ -498,34 +505,30 @@ class ModuleInstaller implements ModuleInstallerInterface { * The name of the module for which to remove all registered cache bins. */ protected function removeCacheBins($module) { - // Remove any cache bins defined by a module. $service_yaml_file = drupal_get_path('module', $module) . "/$module.services.yml"; - if (file_exists($service_yaml_file)) { - $definitions = Yaml::decode(file_get_contents($service_yaml_file)); - if (isset($definitions['services'])) { - foreach ($definitions['services'] as $id => $definition) { - if (isset($definition['tags'])) { - foreach ($definition['tags'] as $tag) { - // This works for the default cache registration and even in some - // cases when a non-default "super" factory is used. That should - // be extremely rare. - if ($tag['name'] == 'cache.bin' && isset($definition['factory_service']) && isset($definition['factory_method']) && !empty($definition['arguments'])) { - try { - $factory = \Drupal::service($definition['factory_service']); - if (method_exists($factory, $definition['factory_method'])) { - $backend = call_user_func_array([$factory, $definition['factory_method']], $definition['arguments']); - if ($backend instanceof CacheBackendInterface) { - $backend->removeBin(); - } - } - } - catch (\Exception $e) { - watchdog_exception('system', $e, 'Failed to remove cache bin defined by the service %id.', ['%id' => $id]); - } - } - } + if (!file_exists($service_yaml_file)) { + return; + } + + $definitions = Yaml::decode(file_get_contents($service_yaml_file)); + + $cache_bin_services = array_filter( + isset($definitions['services']) ? $definitions['services'] : [], + function ($definition) { + $tags = isset($definition['tags']) ? $definition['tags'] : []; + foreach ($tags as $tag) { + if (isset($tag['name']) && ($tag['name'] == 'cache.bin')) { + return TRUE; } } + return FALSE; + } + ); + + foreach (array_keys($cache_bin_services) as $service_id) { + $backend = $this->kernel->getContainer()->get($service_id); + if ($backend instanceof CacheBackendInterface) { + $backend->removeBin(); } } } diff --git a/core/lib/Drupal/Core/Extension/ThemeInstaller.php b/core/lib/Drupal/Core/Extension/ThemeInstaller.php index db1226fa9..5472d3efe 100644 --- a/core/lib/Drupal/Core/Extension/ThemeInstaller.php +++ b/core/lib/Drupal/Core/Extension/ThemeInstaller.php @@ -265,7 +265,6 @@ class ThemeInstaller implements ThemeInstallerInterface { $extension_config->save(TRUE); $this->state->set('system.theme.data', $current_theme_data); - // @todo Remove system_list(). $this->themeHandler->refreshInfo(); $this->resetSystem(); diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php index a1a1ebdb9..c2e9ada44 100644 --- a/core/lib/Drupal/Core/Field/FieldItemList.php +++ b/core/lib/Drupal/Core/Field/FieldItemList.php @@ -7,6 +7,7 @@ use Drupal\Core\Entity\FieldableEntityInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\Core\TypedData\DataDefinitionInterface; use Drupal\Core\TypedData\Plugin\DataType\ItemList; /** @@ -378,7 +379,6 @@ class FieldItemList extends ItemList implements FieldItemListInterface { * {@inheritdoc} */ public function equals(FieldItemListInterface $list_to_compare) { - $columns = $this->getFieldDefinition()->getFieldStorageDefinition()->getColumns(); $count1 = count($this); $count2 = count($list_to_compare); if ($count1 === 0 && $count2 === 0) { @@ -396,9 +396,13 @@ class FieldItemList extends ItemList implements FieldItemListInterface { } // If the values are not equal ensure a consistent order of field item // properties and remove properties which will not be saved. - $callback = function (&$value) use ($columns) { + $property_definitions = $this->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinitions(); + $non_computed_properties = array_filter($property_definitions, function (DataDefinitionInterface $property) { + return !$property->isComputed(); + }); + $callback = function (&$value) use ($non_computed_properties) { if (is_array($value)) { - $value = array_intersect_key($value, $columns); + $value = array_intersect_key($value, $non_computed_properties); ksort($value); } }; diff --git a/core/lib/Drupal/Core/Field/MapFieldItemList.php b/core/lib/Drupal/Core/Field/MapFieldItemList.php new file mode 100644 index 000000000..2d86daee4 --- /dev/null +++ b/core/lib/Drupal/Core/Field/MapFieldItemList.php @@ -0,0 +1,34 @@ +getValue(); + $value2 = $list_to_compare->getValue(); + + return $value1 == $value2; + } + +} diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php index af994361f..a40b56adb 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php @@ -82,7 +82,7 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem * The view mode. * @param array $third_party_settings * Any third party settings settings. - * @param LoggerChannelFactoryInterface $logger_factory + * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory * The logger factory. * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * The entity type manager. diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php index f9922b9f4..70f9dc9f4 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php @@ -503,19 +503,6 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf } $bundles_changed = TRUE; - - // In case we deleted the only target bundle allowed by the field - // we have to log a critical message because the field will not - // function correctly anymore. - if ($handler_settings['target_bundles'] === []) { - \Drupal::logger('entity_reference')->critical('The %target_bundle bundle (entity type: %target_entity_type) was deleted. As a result, the %field_name entity reference field (entity_type: %entity_type, bundle: %bundle) no longer has any valid bundle it can reference. The field is not working correctly anymore and has to be adjusted.', [ - '%target_bundle' => $bundle->label(), - '%target_entity_type' => $bundle->getEntityType()->getBundleOf(), - '%field_name' => $field_definition->getName(), - '%entity_type' => $field_definition->getTargetEntityTypeId(), - '%bundle' => $field_definition->getTargetBundle() - ]); - } } } } diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php index 04045c7d2..e15fe848b 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php @@ -12,7 +12,8 @@ use Drupal\Core\Field\FieldItemBase; * id = "map", * label = @Translation("Map"), * description = @Translation("An entity field for storing a serialized array of values."), - * no_ui = TRUE + * no_ui = TRUE, + * list_class = "\Drupal\Core\Field\MapFieldItemList", * ) */ class MapItem extends FieldItemBase { diff --git a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php index 3b490f0f1..df6a10b1d 100644 --- a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php +++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php @@ -42,7 +42,7 @@ class Email extends FieldPluginBase { */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { $process = [ - 'plugin' => 'iterator', + 'plugin' => 'sub_process', 'source' => $field_name, 'process' => [ 'value' => 'email', diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php index a8ad4010b..ff149b8f9 100644 --- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php +++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php @@ -41,7 +41,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface { /** * Constructs a MimeTypeGuesser object. * - * @param StreamWrapperManagerInterface $stream_wrapper_manager + * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager * The stream wrapper manager. */ public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager) { diff --git a/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php b/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php index cae439802..6c9c1788f 100644 --- a/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php +++ b/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php @@ -3,7 +3,7 @@ namespace Drupal\Core\Form\EventSubscriber; use Drupal\Core\Ajax\AjaxResponse; -use Drupal\Core\Ajax\ReplaceCommand; +use Drupal\Core\Ajax\PrependCommand; use Drupal\Core\EventSubscriber\MainContentViewSubscriber; use Drupal\Core\Form\Exception\BrokenPostRequestException; use Drupal\Core\Form\FormAjaxException; @@ -78,7 +78,7 @@ class FormAjaxSubscriber implements EventSubscriberInterface { $this->drupalSetMessage($this->t('An unrecoverable error occurred. The uploaded file likely exceeded the maximum file size (@size) that this server supports.', ['@size' => $this->formatSize($exception->getSize())]), 'error'); $response = new AjaxResponse(); $status_messages = ['#type' => 'status_messages']; - $response->addCommand(new ReplaceCommand(NULL, $status_messages)); + $response->addCommand(new PrependCommand(NULL, $status_messages)); $response->headers->set('X-Status-Code', 200); $event->setResponse($response); return; diff --git a/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php b/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php index c06366646..2668f59a4 100644 --- a/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php +++ b/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php @@ -557,7 +557,7 @@ abstract class FormStateDecoratorBase implements FormStateInterface { /** * {@inheritdoc} */ - public function isValueEmpty($key) { + public function isValueEmpty($key) { return $this->decoratedFormState->isValueEmpty($key); } diff --git a/core/lib/Drupal/Core/GeneratedLink.php b/core/lib/Drupal/Core/GeneratedLink.php index 09411876e..c2c4900e1 100644 --- a/core/lib/Drupal/Core/GeneratedLink.php +++ b/core/lib/Drupal/Core/GeneratedLink.php @@ -32,7 +32,7 @@ class GeneratedLink extends BubbleableMetadata implements MarkupInterface, \Coun * @return string */ public function getGeneratedLink() { - return $this->generatedLink ; + return $this->generatedLink; } /** diff --git a/core/lib/Drupal/Core/GeneratedUrl.php b/core/lib/Drupal/Core/GeneratedUrl.php index f3bf6581d..ccb6e9a76 100644 --- a/core/lib/Drupal/Core/GeneratedUrl.php +++ b/core/lib/Drupal/Core/GeneratedUrl.php @@ -25,7 +25,7 @@ class GeneratedUrl extends BubbleableMetadata { * @return string */ public function getGeneratedUrl() { - return $this->generatedUrl ; + return $this->generatedUrl; } /** diff --git a/core/lib/Drupal/Core/Installer/ConfigOverride.php b/core/lib/Drupal/Core/Installer/ConfigOverride.php new file mode 100644 index 000000000..ff8d068b2 --- /dev/null +++ b/core/lib/Drupal/Core/Installer/ConfigOverride.php @@ -0,0 +1,62 @@ +register('core.install_config_override', static::class) + ->addTag('config.factory.override'); + } + + /** + * {@inheritdoc} + */ + public function loadOverrides($names) { + $overrides = []; + if (drupal_installation_attempted() && function_exists('drupal_install_profile_distribution_name')) { + // Early in the installer the site name is unknown. In this case we need + // to fallback to the distribution's name. + $overrides['system.site'] = [ + 'name' => drupal_install_profile_distribution_name(), + ]; + } + return $overrides; + } + + /** + * {@inheritdoc} + */ + public function getCacheSuffix() { + return 'core.install_config_override'; + } + + /** + * {@inheritdoc} + */ + public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION) { + return NULL; + } + + /** + * {@inheritdoc} + */ + public function getCacheableMetadata($name) { + return new CacheableMetadata(); + } + +} diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php index eeaf510ea..52d288306 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php @@ -40,7 +40,7 @@ class KeyValueFactory implements KeyValueFactoryInterface { protected $stores = []; /** - * var \Symfony\Component\DependencyInjection\ContainerInterface + * @var \Symfony\Component\DependencyInjection\ContainerInterface */ protected $container; diff --git a/core/lib/Drupal/Core/Mail/MailManager.php b/core/lib/Drupal/Core/Mail/MailManager.php index 6a092c932..348dceeb2 100644 --- a/core/lib/Drupal/Core/Mail/MailManager.php +++ b/core/lib/Drupal/Core/Mail/MailManager.php @@ -3,6 +3,7 @@ namespace Drupal\Core\Mail; use Drupal\Component\Render\PlainTextOutput; +use Drupal\Component\Utility\Unicode; use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\Core\Cache\CacheBackendInterface; @@ -248,7 +249,12 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface { // Return-Path headers should have a domain authorized to use the // originating SMTP server. $headers['Sender'] = $headers['Return-Path'] = $site_mail; - $headers['From'] = $site_config->get('name') . ' <' . $site_mail . '>'; + // Headers are usually encoded in the mail plugin that implements + // \Drupal\Core\Mail\MailInterface::mail(), for example, + // \Drupal\Core\Mail\Plugin\Mail\PhpMail::mail(). The site name must be + // encoded here to prevent mail plugins from encoding the email address, + // which would break the header. + $headers['From'] = Unicode::mimeHeaderEncode($site_config->get('name'), TRUE) . ' <' . $site_mail . '>'; if ($reply) { $headers['Reply-to'] = $reply; } diff --git a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php index 0f938a035..d7afecd6e 100644 --- a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php +++ b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php @@ -28,6 +28,8 @@ class PhpassHashedPassword implements PasswordInterface { /** * Returns a string for mapping an int to the corresponding base 64 character. + * + * @var string */ public static $ITOA64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php index 1c252e296..63e4038ab 100644 --- a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php +++ b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php @@ -17,7 +17,7 @@ class ContextDefinition implements ContextDefinitionInterface { /** * The data type of the data. * - * @return string + * @var string * The data type. */ protected $dataType; @@ -25,7 +25,7 @@ class ContextDefinition implements ContextDefinitionInterface { /** * The human-readable label. * - * @return string + * @var string * The label. */ protected $label; @@ -33,7 +33,7 @@ class ContextDefinition implements ContextDefinitionInterface { /** * The human-readable description. * - * @return string|null + * @var string|null * The description, or NULL if no description is available. */ protected $description; diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php index 241378458..98cf6363e 100644 --- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php +++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php @@ -87,19 +87,19 @@ class HtmlTag extends RenderElement { $escaped_tag = HtmlUtility::escape($element['#tag']); $open_tag = '<' . $escaped_tag . $attributes; $close_tag = '\n"; - $prefix = isset($element['#prefix']) ? $element['#prefix'] . $open_tag : $open_tag; - $suffix = isset($element['#suffix']) ? $close_tag . $element['#suffix'] : $close_tag; // Construct a void element. if (in_array($element['#tag'], self::$voidElements)) { - $prefix .= " />\n"; - $suffix = ''; + $open_tag .= ' />'; + $close_tag = "\n"; } // Construct all other elements. else { - $prefix .= '>'; + $open_tag .= '>'; $markup = $element['#value'] instanceof MarkupInterface ? $element['#value'] : Xss::filterAdmin($element['#value']); $element['#markup'] = Markup::create($markup); } + $prefix = isset($element['#prefix']) ? $element['#prefix'] . $open_tag : $open_tag; + $suffix = isset($element['#suffix']) ? $close_tag . $element['#suffix'] : $close_tag; if (!empty($element['#noscript'])) { $prefix = ''; diff --git a/core/lib/Drupal/Core/Render/Element/RenderElement.php b/core/lib/Drupal/Core/Render/Element/RenderElement.php index 46c6f297e..5a26db0c0 100644 --- a/core/lib/Drupal/Core/Render/Element/RenderElement.php +++ b/core/lib/Drupal/Core/Render/Element/RenderElement.php @@ -269,7 +269,6 @@ abstract class RenderElement extends PluginBase implements ElementInterface { $element['#attributes']['data-disable-refocus'] = "true"; } - // Add a reasonable default event handler if none was specified. if (isset($element['#ajax']) && !isset($element['#ajax']['event'])) { switch ($element['#type']) { diff --git a/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php b/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php index 664063a5f..cc0d22851 100644 --- a/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php +++ b/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php @@ -62,7 +62,7 @@ class DialogRenderer implements MainContentRendererInterface { * * @param array &$options * The 'target' option, if set, is used, and then removed from $options. - * @param RouteMatchInterface $route_match + * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * When no 'target' option is set in $options, $route_match is used instead * to determine the target. * diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php index 5038851ed..00246943f 100644 --- a/core/lib/Drupal/Core/Render/Renderer.php +++ b/core/lib/Drupal/Core/Render/Renderer.php @@ -509,11 +509,17 @@ class Renderer implements RendererInterface { // We store the resulting output in $elements['#markup'], to be consistent // with how render cached output gets stored. This ensures that placeholder // replacement logic gets the same data to work with, no matter if #cache is - // disabled, #cache is enabled, there is a cache hit or miss. - $prefix = isset($elements['#prefix']) ? $this->xssFilterAdminIfUnsafe($elements['#prefix']) : ''; - $suffix = isset($elements['#suffix']) ? $this->xssFilterAdminIfUnsafe($elements['#suffix']) : ''; - - $elements['#markup'] = Markup::create($prefix . $elements['#children'] . $suffix); + // disabled, #cache is enabled, there is a cache hit or miss. If + // #render_children is set the #prefix and #suffix will have already been + // added. + if (isset($elements['#render_children'])) { + $elements['#markup'] = Markup::create($elements['#children']); + } + else { + $prefix = isset($elements['#prefix']) ? $this->xssFilterAdminIfUnsafe($elements['#prefix']) : ''; + $suffix = isset($elements['#suffix']) ? $this->xssFilterAdminIfUnsafe($elements['#suffix']) : ''; + $elements['#markup'] = Markup::create($prefix . $elements['#children'] . $suffix); + } // We've rendered this element (and its subtree!), now update the context. $context->update($elements); diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php index f91411b74..754641cce 100644 --- a/core/lib/Drupal/Core/Render/theme.api.php +++ b/core/lib/Drupal/Core/Render/theme.api.php @@ -613,6 +613,10 @@ function hook_preprocess_HOOK(&$variables) { * hook called (in this case 'node__article') is available in * $variables['theme_hook_original']. * + * Implementations of this hook must be placed in *.module or *.theme files, or + * must otherwise make sure that the hook implementation is available at + * any given time. + * * @todo Add @code sample. * * @param array $variables @@ -694,6 +698,10 @@ function hook_theme_suggestions_alter(array &$suggestions, array $variables, $ho * hook called (in this case 'node__article') is available in * $variables['theme_hook_original']. * + * Implementations of this hook must be placed in *.module or *.theme files, or + * must otherwise make sure that the hook implementation is available at + * any given time. + * * @todo Add @code sample. * * @param array $suggestions diff --git a/core/lib/Drupal/Core/Routing/MatcherDumper.php b/core/lib/Drupal/Core/Routing/MatcherDumper.php index 0de728892..f19b0eed8 100644 --- a/core/lib/Drupal/Core/Routing/MatcherDumper.php +++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php @@ -141,7 +141,6 @@ class MatcherDumper implements MatcherDumperInterface { $insert->execute(); } - } catch (\Exception $e) { $transaction->rollBack(); diff --git a/core/lib/Drupal/Core/Routing/RouteMatch.php b/core/lib/Drupal/Core/Routing/RouteMatch.php index 5784b7f7c..10c444758 100644 --- a/core/lib/Drupal/Core/Routing/RouteMatch.php +++ b/core/lib/Drupal/Core/Routing/RouteMatch.php @@ -67,7 +67,7 @@ class RouteMatch implements RouteMatchInterface { /** * Creates a RouteMatch from a request. * - * @param Request $request + * @param \Symfony\Component\HttpFoundation\Request $request * A request object. * * @return \Drupal\Core\Routing\RouteMatchInterface diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php index 94030dfc3..6c20b1e47 100644 --- a/core/lib/Drupal/Core/Routing/RouteProvider.php +++ b/core/lib/Drupal/Core/Routing/RouteProvider.php @@ -135,7 +135,7 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv * very large route sets to be filtered down to likely candidates, which * may then be filtered in memory more completely. * - * @param Request $request + * @param \Symfony\Component\HttpFoundation\Request $request * A request against which to match. * * @return \Symfony\Component\Routing\RouteCollection diff --git a/core/lib/Drupal/Core/Routing/RouteProviderLazyBuilder.php b/core/lib/Drupal/Core/Routing/RouteProviderLazyBuilder.php index 8c59900c8..a2cb8c578 100644 --- a/core/lib/Drupal/Core/Routing/RouteProviderLazyBuilder.php +++ b/core/lib/Drupal/Core/Routing/RouteProviderLazyBuilder.php @@ -3,12 +3,13 @@ namespace Drupal\Core\Routing; use Symfony\Cmf\Component\Routing\PagedRouteProviderInterface; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; /** * A Route Provider front-end for all Drupal-stored routes. */ -class RouteProviderLazyBuilder implements PreloadableRouteProviderInterface, PagedRouteProviderInterface { +class RouteProviderLazyBuilder implements PreloadableRouteProviderInterface, PagedRouteProviderInterface, EventSubscriberInterface { /** * The route provider service. @@ -31,6 +32,18 @@ class RouteProviderLazyBuilder implements PreloadableRouteProviderInterface, Pag */ protected $rebuilt = FALSE; + /** + * Flag to determine if router is currently being rebuilt. + * + * Used to prevent recursive router rebuilds during module installation. + * Recursive rebuilds can occur when route information is required by alter + * hooks that are triggered during a rebuild, for example, + * hook_menu_links_discovered_alter(). + * + * @var bool + */ + protected $rebuilding = FALSE; + /** * RouteProviderLazyBuilder constructor. * @@ -51,7 +64,7 @@ class RouteProviderLazyBuilder implements PreloadableRouteProviderInterface, Pag * The route provider service. */ protected function getRouteProvider() { - if (!$this->rebuilt) { + if (!$this->rebuilt && !$this->rebuilding) { $this->routeBuilder->rebuild(); $this->rebuilt = TRUE; } @@ -132,4 +145,27 @@ class RouteProviderLazyBuilder implements PreloadableRouteProviderInterface, Pag return $this->rebuilt; } + /** + * {@inheritdoc} + */ + public static function getSubscribedEvents() { + $events[RoutingEvents::DYNAMIC][] = ['routerRebuilding', 3000]; + $events[RoutingEvents::FINISHED][] = ['routerRebuildFinished', -3000]; + return $events; + } + + /** + * Sets the router rebuilding flag to TRUE. + */ + public function routerRebuilding() { + $this->rebuilding = TRUE; + } + + /** + * Sets the router rebuilding flag to FALSE. + */ + public function routerRebuildFinished() { + $this->rebuilding = FALSE; + } + } diff --git a/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php b/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php new file mode 100644 index 000000000..7a823a474 --- /dev/null +++ b/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php @@ -0,0 +1,155 @@ +valueComputed === FALSE) { + $this->computeValue(); + $this->valueComputed = TRUE; + } + } + + /** + * {@inheritdoc} + */ + public function getValue() { + $this->ensureComputedValue(); + return parent::getValue(); + } + + /** + * {@inheritdoc} + */ + public function setValue($values, $notify = TRUE) { + parent::setValue($values, $notify); + + // Make sure that subsequent getter calls do not try to compute the values + // again. + $this->valueComputed = TRUE; + } + + /** + * {@inheritdoc} + */ + public function getString() { + $this->ensureComputedValue(); + return parent::getString(); + } + + /** + * {@inheritdoc} + */ + public function get($index) { + if (!is_numeric($index)) { + throw new \InvalidArgumentException('Unable to get a value with a non-numeric delta in a list.'); + } + + // Unlike the base implementation of + // \Drupal\Core\TypedData\ListInterface::get(), we do not add an empty item + // automatically because computed item lists need to behave like + // non-computed ones. For example, calling isEmpty() on a computed item list + // should return TRUE when the values were computed and the item list is + // truly empty. + // @see \Drupal\Core\TypedData\Plugin\DataType\ItemList::get(). + $this->ensureComputedValue(); + + return isset($this->list[$index]) ? $this->list[$index] : NULL; + } + + /** + * {@inheritdoc} + */ + public function set($index, $value) { + $this->ensureComputedValue(); + return parent::set($index, $value); + } + + /** + * {@inheritdoc} + */ + public function appendItem($value = NULL) { + $this->ensureComputedValue(); + return parent::appendItem($value); + } + + /** + * {@inheritdoc} + */ + public function removeItem($index) { + $this->ensureComputedValue(); + return parent::removeItem($index); + } + + /** + * {@inheritdoc} + */ + public function isEmpty() { + $this->ensureComputedValue(); + return parent::isEmpty(); + } + + /** + * {@inheritdoc} + */ + public function offsetExists($offset) { + $this->ensureComputedValue(); + return parent::offsetExists($offset); + } + + /** + * {@inheritdoc} + */ + public function getIterator() { + $this->ensureComputedValue(); + return parent::getIterator(); + } + + /** + * {@inheritdoc} + */ + public function count() { + $this->ensureComputedValue(); + return parent::count(); + } + + /** + * {@inheritdoc} + */ + public function applyDefaultValue($notify = TRUE) { + // Default values do not make sense for computed item lists. However, this + // method can be overridden if needed. + return $this; + } + +} diff --git a/core/modules/action/action.info.yml b/core/modules/action/action.info.yml index 0ef900d85..36abb5bd0 100644 --- a/core/modules/action/action.info.yml +++ b/core/modules/action/action.info.yml @@ -6,8 +6,8 @@ package: Core # core: 8.x configure: entity.action.collection -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/action/migration_templates/d6_action_settings.yml b/core/modules/action/migration_templates/d6_action_settings.yml deleted file mode 100644 index f46092c62..000000000 --- a/core/modules/action/migration_templates/d6_action_settings.yml +++ /dev/null @@ -1,13 +0,0 @@ -id: d6_action_settings -label: Action configuration -migration_tags: - - Drupal 6 -source: - plugin: variable - variables: - - actions_max_stack -process: - recursion_limit: actions_max_stack -destination: - plugin: config - config_name: action.settings diff --git a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml b/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml index 006278279..5dbd2d092 100644 --- a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml +++ b/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml @@ -9,8 +9,8 @@ dependencies: - views - node -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/action/tests/src/Unit/Plugin/migrate/source/ActionTest.php b/core/modules/action/tests/src/Unit/Plugin/migrate/source/ActionTest.php deleted file mode 100644 index 3ef553e82..000000000 --- a/core/modules/action/tests/src/Unit/Plugin/migrate/source/ActionTest.php +++ /dev/null @@ -1,68 +0,0 @@ - 'test', - 'source' => array( - 'plugin' => 'action', - ), - ); - - // We need to set up the database contents; it's easier to do that below. - - protected $expectedResults = array( - array( - 'aid' => 'Redirect to node list page', - 'type' => 'system', - 'callback' => 'system_goto_action', - 'parameters' => 'a:1:{s:3:"url";s:4:"node";}', - 'description' => 'Redirect to node list page', - ), - array( - 'aid' => 'Test notice email', - 'type' => 'system', - 'callback' => 'system_send_email_action', - 'parameters' => 'a:3:{s:9:"recipient";s:7:"%author";s:7:"subject";s:4:"Test";s:7:"message";s:4:"Test', - 'description' => 'Test notice email', - ), - array( - 'aid' => 'comment_publish_action', - 'type' => 'comment', - 'callback' => 'comment_publish_action', - 'parameters' => NULL, - 'description' => NULL, - ), - array( - 'aid' => 'node_publish_action', - 'type' => 'comment', - 'callback' => 'node_publish_action', - 'parameters' => NULL, - 'description' => NULL, - ), - ); - - /** - * {@inheritdoc} - */ - protected function setUp() { - $this->databaseContents['actions'] = $this->expectedResults; - parent::setUp(); - } - -} diff --git a/core/modules/aggregator/aggregator.info.yml b/core/modules/aggregator/aggregator.info.yml index d4d258a2a..29aeb079f 100644 --- a/core/modules/aggregator/aggregator.info.yml +++ b/core/modules/aggregator/aggregator.info.yml @@ -9,8 +9,8 @@ dependencies: - file - options -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install index 84e961474..872289209 100644 --- a/core/modules/aggregator/aggregator.install +++ b/core/modules/aggregator/aggregator.install @@ -40,3 +40,13 @@ function aggregator_update_8200() { $field_definition->setRequired(TRUE); $definition_update_manager->updateFieldStorageDefinition($field_definition); } + +/** + * Add a default value for the 'Refresh' field for aggregator feed entities. + */ +function aggregator_update_8501() { + $definition_update_manager = \Drupal::entityDefinitionUpdateManager(); + $field_definition = $definition_update_manager->getFieldStorageDefinition('refresh', 'aggregator_feed'); + $field_definition->setDefaultValue(3600); + $definition_update_manager->updateFieldStorageDefinition($field_definition); +} diff --git a/core/modules/aggregator/src/Controller/AggregatorController.php b/core/modules/aggregator/src/Controller/AggregatorController.php index 0090ca310..b459b196c 100644 --- a/core/modules/aggregator/src/Controller/AggregatorController.php +++ b/core/modules/aggregator/src/Controller/AggregatorController.php @@ -47,10 +47,7 @@ class AggregatorController extends ControllerBase { * A form array as expected by drupal_render(). */ public function feedAdd() { - $feed = $this->entityManager()->getStorage('aggregator_feed') - ->create([ - 'refresh' => 3600, - ]); + $feed = $this->entityManager()->getStorage('aggregator_feed')->create(); return $this->entityFormBuilder()->getForm($feed); } diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php index 3b14e8c24..e27450c7a 100644 --- a/core/modules/aggregator/src/Entity/Feed.php +++ b/core/modules/aggregator/src/Entity/Feed.php @@ -168,6 +168,7 @@ class Feed extends ContentEntityBase implements FeedInterface { $fields['refresh'] = BaseFieldDefinition::create('list_integer') ->setLabel(t('Update interval')) ->setDescription(t('The length of time between feed updates. Requires a correctly configured cron maintenance task.')) + ->setDefaultValue(3600) ->setSetting('unsigned', TRUE) ->setRequired(TRUE) ->setSetting('allowed_values', $period) diff --git a/core/modules/aggregator/src/Tests/AddFeedTest.php b/core/modules/aggregator/src/Tests/AddFeedTest.php deleted file mode 100644 index b7ffe5fbc..000000000 --- a/core/modules/aggregator/src/Tests/AddFeedTest.php +++ /dev/null @@ -1,95 +0,0 @@ -drupalPlaceBlock('page_title_block'); - } - - /** - * Creates and ensures that a feed is unique, checks source, and deletes feed. - */ - public function testAddFeed() { - $feed = $this->createFeed(); - $feed->refreshItems(); - - // Check feed data. - $this->assertUrl(\Drupal::url('aggregator.feed_add', [], ['absolute' => TRUE]), [], 'Directed to correct URL.'); - $this->assertTrue($this->uniqueFeed($feed->label(), $feed->getUrl()), 'The feed is unique.'); - - // Check feed source. - $this->drupalGet('aggregator/sources/' . $feed->id()); - $this->assertResponse(200, 'Feed source exists.'); - $this->assertText($feed->label(), 'Page title'); - $this->assertRaw($feed->getWebsiteUrl()); - - // Try to add a duplicate. - $edit = [ - 'title[0][value]' => $feed->label(), - 'url[0][value]' => $feed->getUrl(), - 'refresh' => '900', - ]; - $this->drupalPostForm('aggregator/sources/add', $edit, t('Save')); - $this->assertRaw(t('A feed named %feed already exists. Enter a unique title.', array('%feed' => $feed->label()))); - $this->assertRaw(t('A feed with this URL %url already exists. Enter a unique URL.', array('%url' => $feed->getUrl()))); - - // Delete feed. - $this->deleteFeed($feed); - } - - /** - * Ensures that the feed label is escaping when rendering the feed icon. - */ - public function testFeedLabelEscaping() { - $feed = $this->createFeed(NULL, ['title[0][value]' => 'Test feed title ']); - $this->checkForMetaRefresh(); - - $this->drupalGet('aggregator/sources/' . $feed->id()); - $this->assertResponse(200); - - $this->assertEscaped('Test feed title '); - $this->assertNoRaw('Test feed title '); - - // Ensure the feed icon title is escaped. - $this->assertTrue(strpos(str_replace(["\n", "\r"], '', $this->getRawContent()), 'class="feed-icon"> Subscribe to Test feed title <script>alert(123);</script> feed') !== FALSE); - } - - /** - * Tests feeds with very long URLs. - */ - public function testAddLongFeed() { - // Create a feed with a URL of > 255 characters. - $long_url = "https://www.google.com/search?ix=heb&sourceid=chrome&ie=UTF-8&q=angie+byron#sclient=psy-ab&hl=en&safe=off&source=hp&q=angie+byron&pbx=1&oq=angie+byron&aq=f&aqi=&aql=&gs_sm=3&gs_upl=0l0l0l10534l0l0l0l0l0l0l0l0ll0l0&bav=on.2,or.r_gc.r_pw.r_cp.,cf.osb&fp=a70b6b1f0abe28d8&biw=1629&bih=889&ix=heb"; - $feed = $this->createFeed($long_url); - $feed->refreshItems(); - - // Create a second feed of > 255 characters, where the only difference is - // after the 255th character. - $long_url_2 = "https://www.google.com/search?ix=heb&sourceid=chrome&ie=UTF-8&q=angie+byron#sclient=psy-ab&hl=en&safe=off&source=hp&q=angie+byron&pbx=1&oq=angie+byron&aq=f&aqi=&aql=&gs_sm=3&gs_upl=0l0l0l10534l0l0l0l0l0l0l0l0ll0l0&bav=on.2,or.r_gc.r_pw.r_cp.,cf.osb&fp=a70b6b1f0abe28d8&biw=1629&bih=889"; - $feed_2 = $this->createFeed($long_url_2); - $feed->refreshItems(); - - // Check feed data. - $this->assertTrue($this->uniqueFeed($feed->label(), $feed->getUrl()), 'The first long URL feed is unique.'); - $this->assertTrue($this->uniqueFeed($feed_2->label(), $feed_2->getUrl()), 'The second long URL feed is unique.'); - - // Check feed source. - $this->drupalGet('aggregator/sources/' . $feed->id()); - $this->assertResponse(200, 'Long URL feed source exists.'); - $this->assertText($feed->label(), 'Page title'); - - // Delete feeds. - $this->deleteFeed($feed); - $this->deleteFeed($feed_2); - } - -} diff --git a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php deleted file mode 100644 index 249817f38..000000000 --- a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php +++ /dev/null @@ -1,84 +0,0 @@ -drupalGet('admin/config'); - $this->clickLink('Feed aggregator'); - $this->clickLink('Settings'); - // Make sure that test plugins are present. - $this->assertText('Test fetcher'); - $this->assertText('Test parser'); - $this->assertText('Test processor'); - - // Set new values and enable test plugins. - $edit = array( - 'aggregator_allowed_html_tags' => '', - 'aggregator_summary_items' => 10, - 'aggregator_clear' => 3600, - 'aggregator_teaser_length' => 200, - 'aggregator_fetcher' => 'aggregator_test_fetcher', - 'aggregator_parser' => 'aggregator_test_parser', - 'aggregator_processors[aggregator_test_processor]' => 'aggregator_test_processor', - ); - $this->drupalPostForm('admin/config/services/aggregator/settings', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.')); - - foreach ($edit as $name => $value) { - $this->assertFieldByName($name, $value, format_string('"@name" has correct default value.', array('@name' => $name))); - } - - // Check for our test processor settings form. - $this->assertText(t('Dummy length setting')); - // Change its value to ensure that settingsSubmit is called. - $edit = array( - 'dummy_length' => 100, - ); - $this->drupalPostForm('admin/config/services/aggregator/settings', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.')); - $this->assertFieldByName('dummy_length', 100, '"dummy_length" has correct default value.'); - - // Make sure settings form is still accessible even after uninstalling a module - // that provides the selected plugins. - $this->container->get('module_installer')->uninstall(array('aggregator_test')); - $this->resetAll(); - $this->drupalGet('admin/config/services/aggregator/settings'); - $this->assertResponse(200); - } - - /** - * Tests the overview page. - */ - function testOverviewPage() { - $feed = $this->createFeed($this->getRSS091Sample()); - $this->drupalGet('admin/config/services/aggregator'); - - $result = $this->xpath('//table/tbody/tr'); - // Check if the amount of feeds in the overview matches the amount created. - $this->assertEqual(1, count($result), 'Created feed is found in the overview'); - // Check if the fields in the table match with what's expected. - $this->assertEqual($feed->label(), (string) $result[0]->td[0]->a); - $count = $this->container->get('entity.manager')->getStorage('aggregator_item')->getItemCount($feed); - $this->assertEqual(\Drupal::translation()->formatPlural($count, '1 item', '@count items'), (string) $result[0]->td[1]); - - // Update the items of the first feed. - $feed->refreshItems(); - $this->drupalGet('admin/config/services/aggregator'); - $result = $this->xpath('//table/tbody/tr'); - // Check if the fields in the table match with what's expected. - $this->assertEqual($feed->label(), (string) $result[0]->td[0]->a); - $count = $this->container->get('entity.manager')->getStorage('aggregator_item')->getItemCount($feed); - $this->assertEqual(\Drupal::translation()->formatPlural($count, '1 item', '@count items'), (string) $result[0]->td[1]); - } - -} diff --git a/core/modules/aggregator/src/Tests/AggregatorCronTest.php b/core/modules/aggregator/src/Tests/AggregatorCronTest.php deleted file mode 100644 index 34a4cb930..000000000 --- a/core/modules/aggregator/src/Tests/AggregatorCronTest.php +++ /dev/null @@ -1,45 +0,0 @@ -createSampleNodes(); - $feed = $this->createFeed(); - $this->cronRun(); - $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField()); - $this->deleteFeedItems($feed); - $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField()); - $this->cronRun(); - $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField()); - - // Test feed locking when queued for update. - $this->deleteFeedItems($feed); - db_update('aggregator_feed') - ->condition('fid', $feed->id()) - ->fields(array( - 'queued' => REQUEST_TIME, - )) - ->execute(); - $this->cronRun(); - $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField()); - db_update('aggregator_feed') - ->condition('fid', $feed->id()) - ->fields(array( - 'queued' => 0, - )) - ->execute(); - $this->cronRun(); - $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField()); - } - -} diff --git a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php deleted file mode 100644 index dff5c9f14..000000000 --- a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php +++ /dev/null @@ -1,149 +0,0 @@ -drupalPlaceBlock('page_title_block'); - } - - /** - * Adds a feed block to the page and checks its links. - */ - public function testBlockLinks() { - // Create feed. - $this->createSampleNodes(); - $feed = $this->createFeed(); - $this->updateFeedItems($feed, $this->getDefaultFeedItemCount()); - - // Need admin user to be able to access block admin. - $admin_user = $this->drupalCreateUser(array( - 'administer blocks', - 'access administration pages', - 'administer news feeds', - 'access news feeds', - )); - $this->drupalLogin($admin_user); - - $block = $this->drupalPlaceBlock("aggregator_feed_block", array('label' => 'feed-' . $feed->label())); - - // Configure the feed that should be displayed. - $block->getPlugin()->setConfigurationValue('feed', $feed->id()); - $block->getPlugin()->setConfigurationValue('block_count', 2); - $block->save(); - - // Confirm that the block is now being displayed on pages. - $this->drupalGet('test-page'); - $this->assertText($block->label(), 'Feed block is displayed on the page.'); - - // Confirm items appear as links. - $items = $this->container->get('entity.manager')->getStorage('aggregator_item')->loadByFeed($feed->id(), 1); - $links = $this->xpath('//a[@href = :href]', array(':href' => reset($items)->getLink())); - $this->assert(isset($links[0]), 'Item link found.'); - - // Find the expected read_more link. - $href = $feed->url(); - $links = $this->xpath('//a[@href = :href]', array(':href' => $href)); - $this->assert(isset($links[0]), format_string('Link to href %href found.', array('%href' => $href))); - $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags'); - $cache_tags = explode(' ', $cache_tags_header); - $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags)); - - // Visit that page. - $this->drupalGet($feed->urlInfo()->getInternalPath()); - $correct_titles = $this->xpath('//h1[normalize-space(text())=:title]', array(':title' => $feed->label())); - $this->assertFalse(empty($correct_titles), 'Aggregator feed page is available and has the correct title.'); - $cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags')); - $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags)); - $this->assertTrue(in_array('aggregator_feed_view', $cache_tags)); - $this->assertTrue(in_array('aggregator_item_view', $cache_tags)); - - // Set the number of news items to 0 to test that the block does not show - // up. - $block->getPlugin()->setConfigurationValue('block_count', 0); - $block->save(); - // Check that the block is no longer displayed. - $this->drupalGet('test-page'); - $this->assertNoText($block->label(), 'Feed block is not displayed on the page when number of items is set to 0.'); - } - - /** - * Creates a feed and checks that feed's page. - */ - public function testFeedPage() { - // Increase the number of items published in the rss.xml feed so we have - // enough articles to test paging. - $view = entity_load('view', 'frontpage'); - $display = &$view->getDisplay('feed_1'); - $display['display_options']['pager']['options']['items_per_page'] = 30; - $view->save(); - - // Create a feed with 30 items. - $this->createSampleNodes(30); - $feed = $this->createFeed(); - $this->updateFeedItems($feed, 30); - - // Check for presence of an aggregator pager. - $this->drupalGet('aggregator'); - $elements = $this->xpath("//ul[contains(@class, :class)]", array(':class' => 'pager__items')); - $this->assertTrue(!empty($elements), 'Individual source page contains a pager.'); - - // Check for sources page title. - $this->drupalGet('aggregator/sources'); - $titles = $this->xpath('//h1[normalize-space(text())=:title]', array(':title' => 'Sources')); - $this->assertTrue(!empty($titles), 'Source page contains correct title.'); - - // Find the expected read_more link on the sources page. - $href = $feed->url(); - $links = $this->xpath('//a[@href = :href]', array(':href' => $href)); - $this->assertTrue(isset($links[0]), SafeMarkup::format('Link to href %href found.', array('%href' => $href))); - $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags'); - $cache_tags = explode(' ', $cache_tags_header); - $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags)); - - // Check the rss aggregator page as anonymous user. - $this->drupalLogout(); - $this->drupalGet('aggregator/rss'); - $this->assertResponse(403); - - // Check the rss aggregator page as admin. - $this->drupalLogin($this->adminUser); - $this->drupalGet('aggregator/rss'); - $this->assertResponse(200); - $this->assertEqual($this->drupalGetHeader('Content-type'), 'application/rss+xml; charset=utf-8'); - - // Check the opml aggregator page. - $this->drupalGet('aggregator/opml'); - $outline = $this->xpath('//outline[1]'); - $this->assertEqual($outline[0]['type'], 'rss', 'The correct type attribute is used for rss OPML.'); - $this->assertEqual($outline[0]['text'], $feed->label(), 'The correct text attribute is used for rss OPML.'); - $this->assertEqual($outline[0]['xmlurl'], $feed->getUrl(), 'The correct xmlUrl attribute is used for rss OPML.'); - - // Check for the presence of a pager. - $this->drupalGet('aggregator/sources/' . $feed->id()); - $elements = $this->xpath("//ul[contains(@class, :class)]", array(':class' => 'pager__items')); - $this->assertTrue(!empty($elements), 'Individual source page contains a pager.'); - $cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags')); - $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags)); - $this->assertTrue(in_array('aggregator_feed_view', $cache_tags)); - $this->assertTrue(in_array('aggregator_item_view', $cache_tags)); - } - -} diff --git a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php deleted file mode 100644 index 0261ed5a0..000000000 --- a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php +++ /dev/null @@ -1,40 +0,0 @@ - TRUE)); - // Last-modified, but no etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 1), array('absolute' => TRUE)); - // No Last-modified, but etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 0, 'use_etag' => 1), array('absolute' => TRUE)); - // Last-modified and etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 1, 'use_etag' => 1), array('absolute' => TRUE)); - - foreach ($feed_urls as $feed_url) { - $feed = $this->createFeed($feed_url); - // Update and delete items two times in a row to make sure that removal - // resets all 'modified' information (modified, etag, hash) and allows for - // immediate update. There's 8 items in the feed, but one has an empty - // title and is skipped. - $this->updateAndDelete($feed, 7); - $this->updateAndDelete($feed, 7); - $this->updateAndDelete($feed, 7); - // Delete feed. - $this->deleteFeed($feed); - } - } - -} diff --git a/core/modules/aggregator/src/Tests/DeleteFeedTest.php b/core/modules/aggregator/src/Tests/DeleteFeedTest.php deleted file mode 100644 index 4cde81ace..000000000 --- a/core/modules/aggregator/src/Tests/DeleteFeedTest.php +++ /dev/null @@ -1,50 +0,0 @@ -createFeed(); - $feed2 = $this->createFeed(); - - // Place a block for both feeds. - $block = $this->drupalPlaceBlock('aggregator_feed_block'); - $block->getPlugin()->setConfigurationValue('feed', $feed1->id()); - $block->save(); - $block2 = $this->drupalPlaceBlock('aggregator_feed_block'); - $block2->getPlugin()->setConfigurationValue('feed', $feed2->id()); - $block2->save(); - - // Delete feed. - $this->deleteFeed($feed1); - $this->assertText($feed2->label()); - $block_storage = $this->container->get('entity.manager')->getStorage('block'); - $this->assertNull($block_storage->load($block->id()), 'Block for the deleted feed was deleted.'); - $this->assertEqual($block2->id(), $block_storage->load($block2->id())->id(), 'Block for not deleted feed still exists.'); - - // Check feed source. - $this->drupalGet('aggregator/sources/' . $feed1->id()); - $this->assertResponse(404, 'Deleted feed source does not exists.'); - - // Check database for feed. - $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed1->label(), ':url' => $feed1->getUrl()))->fetchField(); - $this->assertFalse($result, 'Feed not found in database'); - } - -} diff --git a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php deleted file mode 100644 index b6e36e9c0..000000000 --- a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php +++ /dev/null @@ -1,63 +0,0 @@ -createFeed(NULL, array('refresh' => '900')); - - $this->drupalGet('admin/config/services/aggregator'); - $this->assertResponse(200, 'Aggregator feed overview page exists.'); - - // The scheduled feed shows that it has not been updated yet and is - // scheduled. - $this->assertText('never', 'The scheduled feed has not been updated yet. Last update shows "never".'); - $this->assertText('imminently', 'The scheduled feed has not been updated yet. Next update shows "imminently".'); - $this->assertNoText('ago', 'The scheduled feed has not been updated yet. Last update does not show "x x ago".'); - $this->assertNoText('left', 'The scheduled feed has not been updated yet. Next update does not show "x x left".'); - - $this->updateFeedItems($scheduled_feed); - $this->drupalGet('admin/config/services/aggregator'); - - // After the update, an interval should be displayed on both last updated - // and next update. - $this->assertNoText('never', 'The scheduled feed has been updated. Last updated changed.'); - $this->assertNoText('imminently', 'The scheduled feed has been updated. Next update changed.'); - $this->assertText('ago', 'The scheduled feed been updated. Last update shows "x x ago".'); - $this->assertText('left', 'The scheduled feed has been updated. Next update shows "x x left".'); - - // Delete scheduled feed. - $this->deleteFeed($scheduled_feed); - - // Create non-scheduled feed. - $non_scheduled_feed = $this->createFeed(NULL, array('refresh' => '0')); - - $this->drupalGet('admin/config/services/aggregator'); - // The non scheduled feed shows that it has not been updated yet. - $this->assertText('never', 'The non scheduled feed has not been updated yet. Last update shows "never".'); - $this->assertNoText('imminently', 'The non scheduled feed does not show "imminently" as next update.'); - $this->assertNoText('ago', 'The non scheduled feed has not been updated. It does not show "x x ago" as last update.'); - $this->assertNoText('left', 'The feed is not scheduled. It does not show a timeframe "x x left" for next update.'); - - $this->updateFeedItems($non_scheduled_feed); - $this->drupalGet('admin/config/services/aggregator'); - - // After the feed update, we still need to see "never" as next update label. - // Last update will show an interval. - $this->assertNoText('imminently', 'The updated non scheduled feed does not show "imminently" as next update.'); - $this->assertText('never', 'The updated non scheduled feed still shows "never" as next update.'); - $this->assertText('ago', 'The non scheduled feed has been updated. It shows "x x ago" as last update.'); - $this->assertNoText('left', 'The feed is not scheduled. It does not show a timeframe "x x left" for next update.'); - } - -} diff --git a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php b/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php deleted file mode 100644 index 2b85c196b..000000000 --- a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php +++ /dev/null @@ -1,52 +0,0 @@ -grantPermission('access news feeds'); - $user_role->save(); - } - - /** - * {@inheritdoc} - */ - protected function createEntity() { - // Create a "Llama" feed. - $feed = Feed::create(array( - 'title' => 'Llama', - 'url' => 'https://www.drupal.org/', - 'refresh' => 900, - 'checked' => 1389919932, - 'description' => 'Drupal.org', - )); - $feed->save(); - - return $feed; - } - -} diff --git a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php b/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php deleted file mode 100644 index 4aac85100..000000000 --- a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php +++ /dev/null @@ -1,44 +0,0 @@ -enableTestPlugins(); - // Create some nodes. - $this->createSampleNodes(); - } - - /** - * Test fetching functionality. - */ - public function testfetch() { - // Create feed with local url. - $feed = $this->createFeed(); - $this->updateFeedItems($feed); - $this->assertFalse(empty($feed->items)); - - // Delete items and restore checked property to 0. - $this->deleteFeedItems($feed); - // Change its name and try again. - $feed->setTitle('Do not fetch'); - $feed->save(); - $this->updateFeedItems($feed); - // Fetch should fail due to feed name. - $this->assertTrue(empty($feed->items)); - } - -} diff --git a/core/modules/aggregator/src/Tests/FeedLanguageTest.php b/core/modules/aggregator/src/Tests/FeedLanguageTest.php deleted file mode 100644 index af8335e10..000000000 --- a/core/modules/aggregator/src/Tests/FeedLanguageTest.php +++ /dev/null @@ -1,85 +0,0 @@ -langcodes = array(ConfigurableLanguage::load('en')); - for ($i = 1; $i < 3; ++$i) { - $language = ConfigurableLanguage::create(array( - 'id' => 'l' . $i, - 'label' => $this->randomString(), - )); - $language->save(); - $this->langcodes[$i] = $language->id(); - } - } - - /** - * Tests creation of feeds with a language. - */ - public function testFeedLanguage() { - $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer news feeds', 'access news feeds', 'create article content']); - $this->drupalLogin($admin_user); - - // Enable language selection for feeds. - $edit['entity_types[aggregator_feed]'] = TRUE; - $edit['settings[aggregator_feed][aggregator_feed][settings][language][language_alterable]'] = TRUE; - - $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration')); - - /** @var \Drupal\aggregator\FeedInterface[] $feeds */ - $feeds = array(); - // Create feeds. - $feeds[1] = $this->createFeed(NULL, array('langcode[0][value]' => $this->langcodes[1])); - $feeds[2] = $this->createFeed(NULL, array('langcode[0][value]' => $this->langcodes[2])); - - // Make sure that the language has been assigned. - $this->assertEqual($feeds[1]->language()->getId(), $this->langcodes[1]); - $this->assertEqual($feeds[2]->language()->getId(), $this->langcodes[2]); - - // Create example nodes to create feed items from and then update the feeds. - $this->createSampleNodes(); - $this->cronRun(); - - // Loop over the created feed items and verify that their language matches - // the one from the feed. - foreach ($feeds as $feed) { - /** @var \Drupal\aggregator\ItemInterface[] $items */ - $items = entity_load_multiple_by_properties('aggregator_item', array('fid' => $feed->id())); - $this->assertTrue(count($items) > 0, 'Feed items were created.'); - foreach ($items as $item) { - $this->assertEqual($item->language()->getId(), $feed->language()->getId()); - } - } - } - -} diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php deleted file mode 100644 index 6c4a04d4c..000000000 --- a/core/modules/aggregator/src/Tests/FeedParserTest.php +++ /dev/null @@ -1,111 +0,0 @@ -config('aggregator.settings')->set('items.expire', AGGREGATOR_CLEAR_NEVER)->save(); - } - - /** - * Tests a feed that uses the RSS 0.91 format. - */ - public function testRSS091Sample() { - $feed = $this->createFeed($this->getRSS091Sample()); - $feed->refreshItems(); - $this->drupalGet('aggregator/sources/' . $feed->id()); - $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label()))); - $this->assertText('First example feed item title'); - $this->assertLinkByHref('http://example.com/example-turns-one'); - $this->assertText('First example feed item description.'); - $this->assertRaw('
assertRaw("Second example feed item title.");
- $this->assertText('Long link feed item title');
- $this->assertText('Long link feed item description');
- $this->assertLinkByHref('http://example.com/tomorrow/and/tomorrow/and/tomorrow/creeps/in/this/petty/pace/from/day/to/day/to/the/last/syllable/of/recorded/time/and/all/our/yesterdays/have/lighted/fools/the/way/to/dusty/death/out/out/brief/candle/life/is/but/a/walking/shadow/a/poor/player/that/struts/and/frets/his/hour/upon/the/stage/and/is/heard/no/more/it/is/a/tale/told/by/an/idiot/full/of/sound/and/fury/signifying/nothing');
- $this->assertText('Long author feed item title');
- $this->assertText('Long author feed item description');
- $this->assertLinkByHref('http://example.com/long/author');
- }
-
- /**
- * Tests a feed that uses the Atom format.
- */
- public function testAtomSample() {
- $feed = $this->createFeed($this->getAtomSample());
- $feed->refreshItems();
- $this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
- $this->assertText('Atom-Powered Robots Run Amok');
- $this->assertLinkByHref('http://example.org/2003/12/13/atom03');
- $this->assertText('Some text.');
- $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a', db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(':link' => 'http://example.org/2003/12/13/atom03'))->fetchField(), 'Atom entry id element is parsed correctly.');
-
- // Check for second feed entry.
- $this->assertText('We tried to stop them, but we failed.');
- $this->assertLinkByHref('http://example.org/2003/12/14/atom03');
- $this->assertText('Some other text.');
- $db_guid = db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(
- ':link' => 'http://example.org/2003/12/14/atom03',
- ))->fetchField();
- $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-bbbb-80da344efa6a', $db_guid, 'Atom entry id element is parsed correctly.');
- }
-
- /**
- * Tests a feed that uses HTML entities in item titles.
- */
- public function testHtmlEntitiesSample() {
- $feed = $this->createFeed($this->getHtmlEntitiesSample());
- $feed->refreshItems();
- $this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
- $this->assertRaw("Quote" Amp&");
- }
-
- /**
- * Tests that a redirected feed is tracked to its target.
- */
- public function testRedirectFeed() {
- $redirect_url = Url::fromRoute('aggregator_test.redirect')->setAbsolute()->toString();
- $feed = Feed::create(array('url' => $redirect_url, 'title' => $this->randomMachineName()));
- $feed->save();
- $feed->refreshItems();
-
- // Make sure that the feed URL was updated correctly.
- $this->assertEqual($feed->getUrl(), \Drupal::url('aggregator_test.feed', array(), array('absolute' => TRUE)));
- }
-
- /**
- * Tests error handling when an invalid feed is added.
- */
- public function testInvalidFeed() {
- // Simulate a typo in the URL to force a curl exception.
- $invalid_url = 'http:/www.drupal.org';
- $feed = Feed::create(array('url' => $invalid_url, 'title' => $this->randomMachineName()));
- $feed->save();
-
- // Update the feed. Use the UI to be able to check the message easily.
- $this->drupalGet('admin/config/services/aggregator');
- $this->clickLink(t('Update items'));
- $this->assertRaw(t('The feed from %title seems to be broken because of error', array('%title' => $feed->label())));
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php b/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
deleted file mode 100644
index 8a7ade05a..000000000
--- a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-enableTestPlugins();
- // Create some nodes.
- $this->createSampleNodes();
- }
-
- /**
- * Test processing functionality.
- */
- public function testProcess() {
- $feed = $this->createFeed();
- $this->updateFeedItems($feed);
- foreach ($feed->items as $iid) {
- $item = Item::load($iid);
- $this->assertTrue(strpos($item->label(), 'testProcessor') === 0);
- }
- }
-
- /**
- * Test deleting functionality.
- */
- public function testDelete() {
- $feed = $this->createFeed();
- $description = $feed->description->value ?: '';
- $this->updateAndDelete($feed, NULL);
- // Make sure the feed title is changed.
- $entities = entity_load_multiple_by_properties('aggregator_feed', array('description' => $description));
- $this->assertTrue(empty($entities));
- }
-
- /**
- * Test post-processing functionality.
- */
- public function testPostProcess() {
- $feed = $this->createFeed(NULL, array('refresh' => 1800));
- $this->updateFeedItems($feed);
- $feed_id = $feed->id();
- // Reset entity cache manually.
- \Drupal::entityManager()->getStorage('aggregator_feed')->resetCache(array($feed_id));
- // Reload the feed to get new values.
- $feed = Feed::load($feed_id);
- // Make sure its refresh rate doubled.
- $this->assertEqual($feed->getRefreshRate(), 3600);
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
deleted file mode 100644
index 1f1e90d40..000000000
--- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content', 'administer blocks'));
- $this->drupalLogin($admin_user);
- }
-
- /**
- * Opens OPML import form.
- */
- public function openImportForm() {
- // Enable the help block.
- $this->drupalPlaceBlock('help_block', array('region' => 'help'));
-
- $this->drupalGet('admin/config/services/aggregator/add/opml');
- $this->assertText('A single OPML document may contain many feeds.', 'Found OPML help text.');
- $this->assertField('files[upload]', 'Found file upload field.');
- $this->assertField('remote', 'Found Remote URL field.');
- $this->assertField('refresh', '', 'Found Refresh field.');
- }
-
- /**
- * Submits form filled with invalid fields.
- */
- public function validateImportFormFields() {
- $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-
- $edit = array();
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertRaw(t('Either upload a file or enter a URL.'), 'Error if no fields are filled.');
-
- $path = $this->getEmptyOpml();
- $edit = array(
- 'files[upload]' => $path,
- 'remote' => file_create_url($path),
- );
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertRaw(t('Either upload a file or enter a URL.'), 'Error if both fields are filled.');
-
- $edit = array('remote' => 'invalidUrl://empty');
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertText(t('The URL invalidUrl://empty is not valid.'), 'Error if the URL is invalid.');
-
- $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
- $this->assertEqual($before, $after, 'No feeds were added during the three last form submissions.');
- }
-
- /**
- * Submits form with invalid, empty, and valid OPML files.
- */
- protected function submitImportForm() {
- $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-
- $form['files[upload]'] = $this->getInvalidOpml();
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $form, t('Import'));
- $this->assertText(t('No new feed has been added.'), 'Attempting to upload invalid XML.');
-
- $edit = array('remote' => file_create_url($this->getEmptyOpml()));
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertText(t('No new feed has been added.'), 'Attempting to load empty OPML from remote URL.');
-
- $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
- $this->assertEqual($before, $after, 'No feeds were added during the two last form submissions.');
-
- db_delete('aggregator_feed')->execute();
-
- $feeds[0] = $this->getFeedEditArray();
- $feeds[1] = $this->getFeedEditArray();
- $feeds[2] = $this->getFeedEditArray();
- $edit = array(
- 'files[upload]' => $this->getValidOpml($feeds),
- 'refresh' => '900',
- );
- $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
- $this->assertRaw(t('A feed with the URL %url already exists.', array('%url' => $feeds[0]['url[0][value]'])), 'Verifying that a duplicate URL was identified');
- $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title[0][value]'])), 'Verifying that a duplicate title was identified');
-
- $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
- $this->assertEqual($after, 2, 'Verifying that two distinct feeds were added.');
-
- $feeds_from_db = db_query("SELECT title, url, refresh FROM {aggregator_feed}");
- $refresh = TRUE;
- foreach ($feeds_from_db as $feed) {
- $title[$feed->url] = $feed->title;
- $url[$feed->title] = $feed->url;
- $refresh = $refresh && $feed->refresh == 900;
- }
-
- $this->assertEqual($title[$feeds[0]['url[0][value]']], $feeds[0]['title[0][value]'], 'First feed was added correctly.');
- $this->assertEqual($url[$feeds[1]['title[0][value]']], $feeds[1]['url[0][value]'], 'Second feed was added correctly.');
- $this->assertTrue($refresh, 'Refresh times are correct.');
- }
-
- /**
- * Tests the import of an OPML file.
- */
- public function testOpmlImport() {
- $this->openImportForm();
- $this->validateImportFormFields();
- $this->submitImportForm();
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php b/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
deleted file mode 100644
index 1986ceaf5..000000000
--- a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-grantPermission('access news feeds');
- $user_role->save();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function createEntity() {
- // Create a "Camelids" feed.
- $feed = Feed::create(array(
- 'title' => 'Camelids',
- 'url' => 'https://groups.drupal.org/not_used/167169',
- 'refresh' => 900,
- 'checked' => 1389919932,
- 'description' => 'Drupal Core Group feed',
- ));
- $feed->save();
-
- // Create a "Llama" aggregator feed item.
- $item = Item::create(array(
- 'fid' => $feed->id(),
- 'title' => t('Llama'),
- 'path' => 'https://www.drupal.org/',
- ));
- $item->save();
-
- return $item;
- }
-
- /**
- * Tests that when creating a feed item, the feed tag is invalidated.
- */
- public function testEntityCreation() {
- // Create a cache entry that is tagged with a feed cache tag.
- \Drupal::cache('render')->set('foo', 'bar', CacheBackendInterface::CACHE_PERMANENT, $this->entity->getCacheTags());
-
- // Verify a cache hit.
- $this->verifyRenderCache('foo', array('aggregator_feed:1'));
-
- // Now create a feed item in that feed.
- Item::create(array(
- 'fid' => $this->entity->getFeedId(),
- 'title' => t('Llama 2'),
- 'path' => 'https://groups.drupal.org/',
- ))->save();
-
- // Verify a cache miss.
- $this->assertFalse(\Drupal::cache('render')->get('foo'), 'Creating a new feed item invalidates the cache tag of the feed.');
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php b/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php
deleted file mode 100644
index 374a38e89..000000000
--- a/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-databaseDumpFiles = [
- __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
- ];
- }
-
- /**
- * Tests that the 'Source feed' field is required.
- *
- * @see aggregator_update_8200()
- */
- public function testSourceFeedRequired() {
- // Check that the 'fid' field is not required prior to the update.
- $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('fid', 'aggregator_item');
- $this->assertFalse($field_definition->isRequired());
-
- // Run updates.
- $this->runUpdates();
-
- // Check that the 'fid' field is now required.
- $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('fid', 'aggregator_item');
- $this->assertTrue($field_definition->isRequired());
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
deleted file mode 100644
index c1c3df907..000000000
--- a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-createSampleNodes();
-
- // Create a feed and test updating feed items if possible.
- $feed = $this->createFeed();
- if (!empty($feed)) {
- $this->updateFeedItems($feed, $this->getDefaultFeedItemCount());
- $this->deleteFeedItems($feed);
- }
-
- // Delete feed.
- $this->deleteFeed($feed);
-
- // Test updating feed items without valid timestamp information.
- $edit = array(
- 'title[0][value]' => "Feed without publish timestamp",
- 'url[0][value]' => $this->getRSS091Sample(),
- );
-
- $this->drupalGet($edit['url[0][value]']);
- $this->assertResponse(200);
-
- $this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
- $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title[0][value]'])), format_string('The feed @name has been added.', array('@name' => $edit['title[0][value]'])));
-
- $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE url = :url", array(':url' => $edit['url[0][value]']))->fetchField();
- $feed = Feed::load($fid);
-
- $feed->refreshItems();
- $before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
-
- // Sleep for 3 second.
- sleep(3);
- db_update('aggregator_feed')
- ->condition('fid', $feed->id())
- ->fields(array(
- 'checked' => 0,
- 'hash' => '',
- 'etag' => '',
- 'modified' => 0,
- ))
- ->execute();
- $feed->refreshItems();
-
- $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
- $this->assertTrue($before === $after, format_string('Publish timestamp of feed item was not updated (@before === @after)', array('@before' => $before, '@after' => $after)));
-
- // Make sure updating items works even after uninstalling a module
- // that provides the selected plugins.
- $this->enableTestPlugins();
- $this->container->get('module_installer')->uninstall(array('aggregator_test'));
- $this->updateFeedItems($feed);
- $this->assertResponse(200);
- }
-
-}
diff --git a/core/modules/aggregator/src/Tests/UpdateFeedTest.php b/core/modules/aggregator/src/Tests/UpdateFeedTest.php
deleted file mode 100644
index 6bfb0f156..000000000
--- a/core/modules/aggregator/src/Tests/UpdateFeedTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-createFeed();
-
- // Get new feed data array and modify newly created feed.
- $edit = $this->getFeedEditArray();
- // Change refresh value.
- $edit['refresh'] = 1800;
- if (isset($feed->{$same_field}->value)) {
- $edit[$same_field] = $feed->{$same_field}->value;
- }
- $this->drupalPostForm('aggregator/sources/' . $feed->id() . '/configure', $edit, t('Save'));
- $this->assertRaw(t('The feed %name has been updated.', array('%name' => $edit['title[0][value]'])), format_string('The feed %name has been updated.', array('%name' => $edit['title[0][value]'])));
-
- // Check feed data.
- $this->assertUrl($feed->url('canonical', ['absolute' => TRUE]));
- $this->assertTrue($this->uniqueFeed($edit['title[0][value]'], $edit['url[0][value]']), 'The feed is unique.');
-
- // Check feed source.
- $this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, 'Feed source exists.');
- $this->assertText($edit['title[0][value]'], 'Page title');
-
- // Set correct title so deleteFeed() will work.
- $feed->title = $edit['title[0][value]'];
-
- // Delete feed.
- $this->deleteFeed($feed);
- }
- }
-
-}
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml
index 1c4980a0f..8c1dbdd78 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml
@@ -5,8 +5,8 @@ package: Testing
# version: VERSION
# core: 8.x
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml
index 8ef9b4cb1..5fb2f155c 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml
@@ -8,8 +8,8 @@ dependencies:
- aggregator
- views
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
core: '8.x'
project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228
diff --git a/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php b/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
index 9d659d018..64bdb8e01 100644
--- a/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
@@ -38,4 +38,21 @@ class AggregatorUpdateTest extends UpdatePathTestBase {
$this->assertTrue($field_definition->isRequired());
}
+ /**
+ * Tests that the 'Update interval' field has a default value.
+ */
+ public function testUpdateIntervalDefaultValue() {
+ // Check that the 'refresh' field does not have a default value prior to the
+ // update.
+ $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('refresh', 'aggregator_feed');
+ $this->assertSame([], $field_definition->getDefaultValueLiteral());
+
+ // Run updates.
+ $this->runUpdates();
+
+ // Check that the 'refresh' has a default value now.
+ $field_definition = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('refresh', 'aggregator_feed');
+ $this->assertSame([['value' => 3600]], $field_definition->getDefaultValueLiteral());
+ }
+
}
diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
index 926723702..56c0339bd 100644
--- a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -109,5 +109,6 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
namespace Drupal\Core\Form;
if (!function_exists('drupal_set_message')) {
- function drupal_set_message() {}
+ function drupal_set_message() {
+ }
}
diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/AggregatorItemTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/AggregatorItemTest.php
deleted file mode 100644
index edae6d673..000000000
--- a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/AggregatorItemTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
- 'test',
- 'source' => array(
- 'plugin' => 'aggregator_item',
- ),
- );
-
- protected $expectedResults = array(
- array(
- 'iid' => 1,
- 'fid' => 1,
- 'title' => 'This (three) weeks in Drupal Core - January 10th 2014',
- 'link' => 'https://groups.drupal.org/node/395218',
- 'author' => 'larowlan',
- 'description' => "What's new with Drupal 8?
", - 'timestamp' => 1389297196, - 'guid' => '395218 at https://groups.drupal.org', - ), - ); - - /** - * {@inheritdoc} - */ - protected function setUp() { - $this->databaseContents['aggregator_item'] = $this->expectedResults; - parent::setUp(); - } - -} diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php deleted file mode 100644 index 85eaf8eeb..000000000 --- a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php +++ /dev/null @@ -1,60 +0,0 @@ - 'test', - 'source' => array( - 'plugin' => 'd6_aggregator_feed', - ), - ); - - protected $expectedResults = array( - array( - 'fid' => 1, - 'title' => 'feed title 1', - 'url' => 'http://example.com/feed.rss', - 'refresh' => 900, - 'checked' => 0, - 'link' => 'http://example.com', - 'description' => 'A vague description', - 'image' => '', - 'etag' => '', - 'modified' => 0, - 'block' => 5, - ), - array( - 'fid' => 2, - 'title' => 'feed title 2', - 'url' => 'http://example.net/news.rss', - 'refresh' => 1800, - 'checked' => 0, - 'link' => 'http://example.net', - 'description' => 'An even more vague description', - 'image' => '', - 'etag' => '', - 'modified' => 0, - 'block' => 5, - ), - ); - - /** - * {@inheritdoc} - */ - protected function setUp() { - $this->databaseContents['aggregator_feed'] = $this->expectedResults; - parent::setUp(); - } - -} diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d7/AggregatorFeedTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d7/AggregatorFeedTest.php deleted file mode 100644 index e80b461a5..000000000 --- a/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d7/AggregatorFeedTest.php +++ /dev/null @@ -1,62 +0,0 @@ - 'test', - 'source' => array( - 'plugin' => 'd7_aggregator_feed', - ), - ); - - protected $expectedResults = array( - array( - 'fid' => 1, - 'title' => 'feed title 1', - 'url' => 'http://example.com/feed.rss', - 'refresh' => 900, - 'checked' => 0, - 'queued' => 0, - 'link' => 'http://example.com', - 'description' => 'A vague description', - 'image' => '', - 'etag' => '', - 'modified' => 0, - 'block' => 5, - ), - array( - 'fid' => 2, - 'title' => 'feed title 2', - 'url' => 'http://example.net/news.rss', - 'refresh' => 1800, - 'checked' => 0, - 'queued' => 0, - 'link' => 'http://example.net', - 'description' => 'An even more vague description', - 'image' => '', - 'etag' => '', - 'modified' => 0, - 'block' => 5, - ), - ); - - /** - * {@inheritdoc} - */ - protected function setUp() { - $this->databaseContents['aggregator_feed'] = $this->expectedResults; - parent::setUp(); - } - -} diff --git a/core/modules/automated_cron/automated_cron.info.yml b/core/modules/automated_cron/automated_cron.info.yml index c7a41322f..1509c78fd 100644 --- a/core/modules/automated_cron/automated_cron.info.yml +++ b/core/modules/automated_cron/automated_cron.info.yml @@ -6,8 +6,8 @@ package: Core # core: 8.x configure: system.cron_settings -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/ban/ban.info.yml b/core/modules/ban/ban.info.yml index 6e5ee0844..aa1aca7f4 100644 --- a/core/modules/ban/ban.info.yml +++ b/core/modules/ban/ban.info.yml @@ -6,8 +6,8 @@ package: Core # core: 8.x configure: ban.admin_page -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php b/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php deleted file mode 100644 index 8ca8f58ee..000000000 --- a/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php +++ /dev/null @@ -1,43 +0,0 @@ - 'test', - 'source' => [ - 'plugin' => 'd7_blocked_ips', - ], - ]; - - protected $expectedResults = [ - [ - 'ip' => '127.0.0.1', - ], - ]; - - /** - * {@inheritdoc} - */ - protected function setUp() { - $this->databaseContents['blocked_ips'] = [ - [ - 'iid' => 1, - 'ip' => '127.0.0.1', - ] - ]; - parent::setUp(); - } - -} diff --git a/core/modules/basic_auth/basic_auth.info.yml b/core/modules/basic_auth/basic_auth.info.yml index 2e1772222..bfa2f52f1 100644 --- a/core/modules/basic_auth/basic_auth.info.yml +++ b/core/modules/basic_auth/basic_auth.info.yml @@ -7,8 +7,8 @@ package: Web services dependencies: - user -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php deleted file mode 100644 index 22bb9ca34..000000000 --- a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php +++ /dev/null @@ -1,178 +0,0 @@ -config('system.performance'); - $config->set('cache.page.max_age', 300); - $config->save(); - - $account = $this->drupalCreateUser(); - $url = Url::fromRoute('router_test.11'); - - $this->basicAuthGet($url, $account->getUsername(), $account->pass_raw); - $this->assertText($account->getUsername(), 'Account name is displayed.'); - $this->assertResponse('200', 'HTTP response is OK'); - $this->curlClose(); - $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache')); - $this->assertIdentical(strpos($this->drupalGetHeader('Cache-Control'), 'public'), FALSE, 'Cache-Control is not set to public'); - - $this->basicAuthGet($url, $account->getUsername(), $this->randomMachineName()); - $this->assertNoText($account->getUsername(), 'Bad basic auth credentials do not authenticate the user.'); - $this->assertResponse('403', 'Access is not granted.'); - $this->curlClose(); - - $this->drupalGet($url); - $this->assertEqual($this->drupalGetHeader('WWW-Authenticate'), SafeMarkup::format('Basic realm="@realm"', ['@realm' => \Drupal::config('system.site')->get('name')])); - $this->assertResponse('401', 'Not authenticated on the route that allows only basic_auth. Prompt to authenticate received.'); - - $this->drupalGet('admin'); - $this->assertResponse('403', 'No authentication prompt for routes not explicitly defining authentication providers.'); - - $account = $this->drupalCreateUser(array('access administration pages')); - - $this->basicAuthGet(Url::fromRoute('system.admin'), $account->getUsername(), $account->pass_raw); - $this->assertNoLink('Log out', 'User is not logged in'); - $this->assertResponse('403', 'No basic authentication for routes not explicitly defining authentication providers.'); - $this->curlClose(); - - // Ensure that pages already in the page cache aren't returned from page - // cache if basic auth credentials are provided. - $url = Url::fromRoute('router_test.10'); - $this->drupalGet($url); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS'); - $this->basicAuthGet($url, $account->getUsername(), $account->pass_raw); - $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache')); - $this->assertIdentical(strpos($this->drupalGetHeader('Cache-Control'), 'public'), FALSE, 'No page cache response when requesting a cached page with basic auth credentials.'); - } - - /** - * Test the global login flood control. - */ - function testGlobalLoginFloodControl() { - $this->config('user.flood') - ->set('ip_limit', 2) - // Set a high per-user limit out so that it is not relevant in the test. - ->set('user_limit', 4000) - ->save(); - - $user = $this->drupalCreateUser(array()); - $incorrect_user = clone $user; - $incorrect_user->pass_raw .= 'incorrect'; - $url = Url::fromRoute('router_test.11'); - - // Try 2 failed logins. - for ($i = 0; $i < 2; $i++) { - $this->basicAuthGet($url, $incorrect_user->getUsername(), $incorrect_user->pass_raw); - } - - // IP limit has reached to its limit. Even valid user credentials will fail. - $this->basicAuthGet($url, $user->getUsername(), $user->pass_raw); - $this->assertResponse('403', 'Access is blocked because of IP based flood prevention.'); - } - - /** - * Test the per-user login flood control. - */ - function testPerUserLoginFloodControl() { - $this->config('user.flood') - // Set a high global limit out so that it is not relevant in the test. - ->set('ip_limit', 4000) - ->set('user_limit', 2) - ->save(); - - $user = $this->drupalCreateUser(array()); - $incorrect_user = clone $user; - $incorrect_user->pass_raw .= 'incorrect'; - $user2 = $this->drupalCreateUser(array()); - $url = Url::fromRoute('router_test.11'); - - // Try a failed login. - $this->basicAuthGet($url, $incorrect_user->getUsername(), $incorrect_user->pass_raw); - - // A successful login will reset the per-user flood control count. - $this->basicAuthGet($url, $user->getUsername(), $user->pass_raw); - $this->assertResponse('200', 'Per user flood prevention gets reset on a successful login.'); - - // Try 2 failed logins for a user. They will trigger flood control. - for ($i = 0; $i < 2; $i++) { - $this->basicAuthGet($url, $incorrect_user->getUsername(), $incorrect_user->pass_raw); - } - - // Now the user account is blocked. - $this->basicAuthGet($url, $user->getUsername(), $user->pass_raw); - $this->assertResponse('403', 'The user account is blocked due to per user flood prevention.'); - - // Try one successful attempt for a different user, it should not trigger - // any flood control. - $this->basicAuthGet($url, $user2->getUsername(), $user2->pass_raw); - $this->assertResponse('200', 'Per user flood prevention does not block access for other users.'); - } - - /** - * Tests compatibility with locale/UI translation. - */ - function testLocale() { - ConfigurableLanguage::createFromLangcode('de')->save(); - $this->config('system.site')->set('default_langcode', 'de')->save(); - - $account = $this->drupalCreateUser(); - $url = Url::fromRoute('router_test.11'); - - $this->basicAuthGet($url, $account->getUsername(), $account->pass_raw); - $this->assertText($account->getUsername(), 'Account name is displayed.'); - $this->assertResponse('200', 'HTTP response is OK'); - $this->curlClose(); - } - - /** - * Tests if a comprehensive message is displayed when the route is denied. - */ - function testUnauthorizedErrorMessage() { - $account = $this->drupalCreateUser(); - $url = Url::fromRoute('router_test.11'); - - // Case when no credentials are passed. - $this->drupalGet($url); - $this->assertResponse('401', 'The user is blocked when no credentials are passed.'); - $this->assertNoText('Exception', "No raw exception is displayed on the page."); - $this->assertText('Please log in to access this page.', "A user friendly access unauthorized message is displayed."); - - // Case when empty credentials are passed. - $this->basicAuthGet($url, NULL, NULL); - $this->assertResponse('403', 'The user is blocked when empty credentials are passed.'); - $this->assertText('Access denied', "A user friendly access denied message is displayed"); - - // Case when wrong credentials are passed. - $this->basicAuthGet($url, $account->getUsername(), $this->randomMachineName()); - $this->assertResponse('403', 'The user is blocked when wrong credentials are passed.'); - $this->assertText('Access denied', "A user friendly access denied message is displayed"); - } - -} diff --git a/core/modules/basic_auth/tests/modules/basic_auth_test/basic_auth_test.info.yml b/core/modules/basic_auth/tests/modules/basic_auth_test/basic_auth_test.info.yml index 1acfe10eb..c04fa0d2f 100644 --- a/core/modules/basic_auth/tests/modules/basic_auth_test/basic_auth_test.info.yml +++ b/core/modules/basic_auth/tests/modules/basic_auth_test/basic_auth_test.info.yml @@ -5,8 +5,8 @@ package: Testing # version: VERSION # core: 8.x -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/big_pipe/big_pipe.info.yml b/core/modules/big_pipe/big_pipe.info.yml index 68d93cffd..94679aab5 100644 --- a/core/modules/big_pipe/big_pipe.info.yml +++ b/core/modules/big_pipe/big_pipe.info.yml @@ -5,8 +5,8 @@ package: Core # version: VERSION # core: 8.x -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/big_pipe/src/Render/BigPipe.php b/core/modules/big_pipe/src/Render/BigPipe.php index b312d7633..ef658c275 100644 --- a/core/modules/big_pipe/src/Render/BigPipe.php +++ b/core/modules/big_pipe/src/Render/BigPipe.php @@ -446,7 +446,6 @@ class BigPipe { } } - // Create a new HtmlResponse. Ensure the CSS and (non-bottom) JS is sent // before the HTML they're associated with. In other words: ensure the // critical assets for this placeholder's markup are loaded first. @@ -483,7 +482,6 @@ class BigPipe { } } - // Send this embedded HTML response. $this->sendChunk($html_response); diff --git a/core/modules/big_pipe/src/Render/BigPipeInterface.php b/core/modules/big_pipe/src/Render/BigPipeInterface.php deleted file mode 100644 index 3e2156b30..000000000 --- a/core/modules/big_pipe/src/Render/BigPipeInterface.php +++ /dev/null @@ -1,144 +0,0 @@ - — this contains BigPipe - * placeholders for the personalized parts of the page. Hence this sends the - * non-personalized parts of the page. Let's call it The Skeleton. - * 2. N chunks: a '; - - // 1. No session (anonymous). - $this->drupalGet(Url::fromRoute('I made some custom content.
', - 'info' => 'Static Block', - 'format' => 1, - ), - array( - 'bid' => 2, - 'body' => 'I made some more custom content.
', - 'info' => 'Test Content', - 'format' => 1, - ), - ); - - /** - * Prepopulate contents with results. - */ - protected function setUp() { - $this->databaseContents['boxes'] = $this->expectedResults; - parent::setUp(); - } - -} diff --git a/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d7/BlockCustomTest.php b/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d7/BlockCustomTest.php deleted file mode 100644 index f2132967b..000000000 --- a/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d7/BlockCustomTest.php +++ /dev/null @@ -1,40 +0,0 @@ - 'test', - 'source' => array( - 'plugin' => 'd7_block_custom', - ), - ); - - protected $expectedResults = array( - array( - 'bid' => '1', - 'body' => "I don't feel creative enough to write anything clever here.", - 'info' => 'Meh', - 'format' => 'filtered_html', - ), - ); - - /** - * {@inheritdoc} - */ - protected function setUp() { - $this->databaseContents['block_custom'] = $this->expectedResults; - parent::setUp(); - } - -} diff --git a/core/modules/block_place/block_place.info.yml b/core/modules/block_place/block_place.info.yml index b357f81c5..6013ffe50 100644 --- a/core/modules/block_place/block_place.info.yml +++ b/core/modules/block_place/block_place.info.yml @@ -8,8 +8,8 @@ hidden: true dependencies: - block -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/book/book.info.yml b/core/modules/book/book.info.yml index 0e6fd8347..654f01628 100644 --- a/core/modules/book/book.info.yml +++ b/core/modules/book/book.info.yml @@ -8,8 +8,8 @@ dependencies: - node configure: book.settings -# Information added by Drupal.org packaging script on 2017-11-03 -version: '8.4.2' +# Information added by Drupal.org packaging script on 2018-01-03 +version: '8.4.4' core: '8.x' project: 'drupal' -datestamp: 1509719929 +datestamp: 1515021228 diff --git a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml deleted file mode 100644 index 79e2ed677..000000000 --- a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml +++ /dev/null @@ -1,21 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - node.type.book -id: node.book.promote -field_name: promote -entity_type: node -bundle: book -label: 'Promoted to front page' -description: '' -required: false -translatable: true -default_value: - - - value: 0 -default_value_callback: '' -settings: - on_label: 'On' - off_label: 'Off' -field_type: boolean diff --git a/core/modules/book/config/install/core.entity_form_display.node.book.default.yml b/core/modules/book/config/install/core.entity_form_display.node.book.default.yml deleted file mode 100644 index 1ec4eb11b..000000000 --- a/core/modules/book/config/install/core.entity_form_display.node.book.default.yml +++ /dev/null @@ -1,54 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - field.field.node.book.body - - node.type.book - module: - - text -id: node.book.default -targetEntityType: node -bundle: book -mode: default -content: - body: - type: text_textarea_with_summary - weight: 26 - settings: - rows: 9 - summary_rows: 3 - placeholder: '' - third_party_settings: { } - created: - type: datetime_timestamp - weight: 10 - settings: { } - third_party_settings: { } - promote: - type: boolean_checkbox - settings: - display_label: true - weight: 15 - third_party_settings: { } - sticky: - type: boolean_checkbox - settings: - display_label: true - weight: 16 - third_party_settings: { } - title: - type: string_textfield - weight: -5 - settings: - size: 60 - placeholder: '' - third_party_settings: { } - uid: - type: entity_reference_autocomplete - weight: 5 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } -hidden: { } diff --git a/core/modules/book/config/install/core.entity_view_display.node.book.default.yml b/core/modules/book/config/install/core.entity_view_display.node.book.default.yml deleted file mode 100644 index 729516eb8..000000000 --- a/core/modules/book/config/install/core.entity_view_display.node.book.default.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - field.field.node.book.body - - node.type.book - module: - - text - - user -id: node.book.default -targetEntityType: node -bundle: book -mode: default -content: - body: - label: hidden - type: text_default - weight: 100 - settings: { } - third_party_settings: { } - links: - weight: 101 -hidden: { } diff --git a/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml b/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml deleted file mode 100644 index fb22db652..000000000 --- a/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml +++ /dev/null @@ -1,25 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - core.entity_view_mode.node.teaser - - field.field.node.book.body - - node.type.book - module: - - text - - user -id: node.book.teaser -targetEntityType: node -bundle: book -mode: teaser -content: - body: - label: hidden - type: text_summary_or_trimmed - weight: 100 - settings: - trim_length: 600 - third_party_settings: { } - links: - weight: 101 -hidden: { } diff --git a/core/modules/book/config/install/core.entity_view_mode.node.print.yml b/core/modules/book/config/install/core.entity_view_mode.node.print.yml deleted file mode 100644 index d615b03a1..000000000 --- a/core/modules/book/config/install/core.entity_view_mode.node.print.yml +++ /dev/null @@ -1,12 +0,0 @@ -langcode: en -status: false -dependencies: - enforced: - module: - - book - module: - - node -id: node.print -label: Print -targetEntityType: node -cache: true diff --git a/core/modules/book/config/install/field.field.node.book.body.yml b/core/modules/book/config/install/field.field.node.book.body.yml deleted file mode 100644 index b97b9fa8b..000000000 --- a/core/modules/book/config/install/field.field.node.book.body.yml +++ /dev/null @@ -1,21 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - field.storage.node.body - - node.type.book - module: - - text -id: node.book.body -field_name: body -entity_type: node -bundle: book -label: Body -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - display_summary: true -field_type: text_with_summary diff --git a/core/modules/book/config/install/node.type.book.yml b/core/modules/book/config/install/node.type.book.yml deleted file mode 100644 index 0d1d0c06b..000000000 --- a/core/modules/book/config/install/node.type.book.yml +++ /dev/null @@ -1,13 +0,0 @@ -langcode: en -status: true -dependencies: - enforced: - module: - - book -name: 'Book page' -type: book -description: 'Books have a built-in hierarchical navigation. Use for handbooks or tutorials.' -help: '' -new_revision: false -preview_mode: 1 -display_submitted: true diff --git a/core/modules/book/src/Tests/BookBreadcrumbTest.php b/core/modules/book/src/Tests/BookBreadcrumbTest.php deleted file mode 100644 index 57e1b3d6c..000000000 --- a/core/modules/book/src/Tests/BookBreadcrumbTest.php +++ /dev/null @@ -1,204 +0,0 @@ -drupalPlaceBlock('system_breadcrumb_block'); - $this->drupalPlaceBlock('page_title_block'); - - // Create users. - $this->bookAuthor = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books')); - $this->adminUser = $this->drupalCreateUser(array('create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'administer content types', 'administer site configuration')); - } - - /** - * Creates a new book with a page hierarchy. - * - * @return \Drupal\node\NodeInterface[] - * The created book nodes. - */ - protected function createBreadcrumbBook() { - // Create new book. - $this->drupalLogin($this->bookAuthor); - - $this->book = $this->createBookNode('new'); - $book = $this->book; - - /* - * Add page hierarchy to book. - * Book - * |- Node 0 - * |- Node 1 - * |- Node 2 - * |- Node 3 - * |- Node 4 - * |- Node 5 - * |- Node 6 - */ - $nodes = array(); - $nodes[0] = $this->createBookNode($book->id()); - $nodes[1] = $this->createBookNode($book->id(), $nodes[0]->id()); - $nodes[2] = $this->createBookNode($book->id(), $nodes[0]->id()); - $nodes[3] = $this->createBookNode($book->id(), $nodes[2]->id()); - $nodes[4] = $this->createBookNode($book->id(), $nodes[3]->id()); - $nodes[5] = $this->createBookNode($book->id(), $nodes[4]->id()); - $nodes[6] = $this->createBookNode($book->id()); - - $this->drupalLogout(); - - return $nodes; - } - - /** - * Creates a book node. - * - * @param int|string $book_nid - * A book node ID or set to 'new' to create a new book. - * @param int|null $parent - * (optional) Parent book reference ID. Defaults to NULL. - * - * @return \Drupal\node\NodeInterface - * The created node. - */ - protected function createBookNode($book_nid, $parent = NULL) { - // $number does not use drupal_static as it should not be reset since it - // uniquely identifies each call to createBookNode(). It is used to ensure - // that when sorted nodes stay in same order. - static $number = 0; - - $edit = array(); - $edit['title[0][value]'] = str_pad($number, 2, '0', STR_PAD_LEFT) . ' - SimpleTest test node ' . $this->randomMachineName(10); - $edit['body[0][value]'] = 'SimpleTest test body ' . $this->randomMachineName(32) . ' ' . $this->randomMachineName(32); - $edit['book[bid]'] = $book_nid; - - if ($parent !== NULL) { - $this->drupalPostForm('node/add/book', $edit, t('Change book (update list of parents)')); - - $edit['book[pid]'] = $parent; - $this->drupalPostForm(NULL, $edit, t('Save')); - // Make sure the parent was flagged as having children. - $parent_node = \Drupal::entityManager()->getStorage('node')->loadUnchanged($parent); - $this->assertFalse(empty($parent_node->book['has_children']), 'Parent node is marked as having children'); - } - else { - $this->drupalPostForm('node/add/book', $edit, t('Save')); - } - - // Check to make sure the book node was created. - $node = $this->drupalGetNodeByTitle($edit['title[0][value]']); - $this->assertNotNull(($node === FALSE ? NULL : $node), 'Book node found in database.'); - $number++; - - return $node; - } - - /** - * Test that the breadcrumb is updated when book content changes. - */ - public function testBreadcrumbTitleUpdates() { - // Create a new book. - $nodes = $this->createBreadcrumbBook(); - $book = $this->book; - - $this->drupalLogin($this->bookAuthor); - - $this->drupalGet($nodes[4]->toUrl()); - // Fetch each node title in the current breadcrumb. - $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a'); - $got_breadcrumb = array(); - foreach ($links as $link) { - $got_breadcrumb[] = (string) $link; - } - // Home link and four parent book nodes should be in the breadcrumb. - $this->assertEqual(5, count($got_breadcrumb)); - $this->assertEqual($nodes[3]->getTitle(), end($got_breadcrumb)); - $edit = [ - 'title[0][value]' => 'Updated node5 title', - ]; - $this->drupalPostForm($nodes[3]->toUrl('edit-form'), $edit, 'Save'); - $this->drupalGet($nodes[4]->toUrl()); - // Fetch each node title in the current breadcrumb. - $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a'); - $got_breadcrumb = array(); - foreach ($links as $link) { - $got_breadcrumb[] = (string) $link; - } - $this->assertEqual(5, count($got_breadcrumb)); - $this->assertEqual($edit['title[0][value]'], end($got_breadcrumb)); - } - - /** - * Test that the breadcrumb is updated when book access changes. - */ - public function testBreadcrumbAccessUpdates() { - // Create a new book. - $nodes = $this->createBreadcrumbBook(); - $this->drupalLogin($this->bookAuthor); - $edit = [ - 'title[0][value]' => "you can't see me", - ]; - $this->drupalPostForm($nodes[3]->toUrl('edit-form'), $edit, 'Save'); - $this->drupalGet($nodes[4]->toUrl()); - $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a'); - $got_breadcrumb = array(); - foreach ($links as $link) { - $got_breadcrumb[] = (string) $link; - } - $this->assertEqual(5, count($got_breadcrumb)); - $this->assertEqual($edit['title[0][value]'], end($got_breadcrumb)); - $config = $this->container->get('config.factory')->getEditable('book_breadcrumb_test.settings'); - $config->set('hide', TRUE)->save(); - $this->drupalGet($nodes[4]->toUrl()); - $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a'); - $got_breadcrumb = array(); - foreach ($links as $link) { - $got_breadcrumb[] = (string) $link; - } - $this->assertEqual(4, count($got_breadcrumb)); - $this->assertEqual($nodes[2]->getTitle(), end($got_breadcrumb)); - $this->drupalGet($nodes[3]->toUrl()); - $this->assertResponse(403); - } - -} diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php deleted file mode 100644 index 7ebec6361..000000000 --- a/core/modules/book/src/Tests/BookTest.php +++ /dev/null @@ -1,755 +0,0 @@ -drupalPlaceBlock('system_breadcrumb_block'); - $this->drupalPlaceBlock('page_title_block'); - - // node_access_test requires a node_access_rebuild(). - node_access_rebuild(); - - // Create users. - $this->bookAuthor = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books')); - $this->webUser = $this->drupalCreateUser(array('access printer-friendly version', 'node test view')); - $this->webUserWithoutNodeAccess = $this->drupalCreateUser(array('access printer-friendly version')); - $this->adminUser = $this->drupalCreateUser(array('create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'node test view', 'administer content types', 'administer site configuration')); - } - - /** - * Creates a new book with a page hierarchy. - * - * @return \Drupal\node\NodeInterface[] - */ - function createBook() { - // Create new book. - $this->drupalLogin($this->bookAuthor); - - $this->book = $this->createBookNode('new'); - $book = $this->book; - - /* - * Add page hierarchy to book. - * Book - * |- Node 0 - * |- Node 1 - * |- Node 2 - * |- Node 3 - * |- Node 4 - */ - $nodes = array(); - $nodes[] = $this->createBookNode($book->id()); // Node 0. - $nodes[] = $this->createBookNode($book->id(), $nodes[0]->book['nid']); // Node 1. - $nodes[] = $this->createBookNode($book->id(), $nodes[0]->book['nid']); // Node 2. - $nodes[] = $this->createBookNode($book->id()); // Node 3. - $nodes[] = $this->createBookNode($book->id()); // Node 4. - - $this->drupalLogout(); - - return $nodes; - } - - /** - * Tests the book navigation cache context. - * - * @see \Drupal\book\Cache\BookNavigationCacheContext - */ - public function testBookNavigationCacheContext() { - // Create a page node. - $this->drupalCreateContentType(['type' => 'page']); - $page = $this->drupalCreateNode(); - - // Create a book, consisting of book nodes. - $book_nodes = $this->createBook(); - - // Enable the debug output. - \Drupal::state()->set('book_test.debug_book_navigation_cache_context', TRUE); - Cache::invalidateTags(['book_test.debug_book_navigation_cache_context']); - - $this->drupalLogin($this->bookAuthor); - - // On non-node route. - $this->drupalGet($this->adminUser->urlInfo()); - $this->assertRaw('[route.book_navigation]=book.none'); - - // On non-book node route. - $this->drupalGet($page->urlInfo()); - $this->assertRaw('[route.book_navigation]=book.none'); - - // On book node route. - $this->drupalGet($book_nodes[0]->urlInfo()); - $this->assertRaw('[route.book_navigation]=0|2|3'); - $this->drupalGet($book_nodes[1]->urlInfo()); - $this->assertRaw('[route.book_navigation]=0|2|3|4'); - $this->drupalGet($book_nodes[2]->urlInfo()); - $this->assertRaw('[route.book_navigation]=0|2|3|5'); - $this->drupalGet($book_nodes[3]->urlInfo()); - $this->assertRaw('[route.book_navigation]=0|2|6'); - $this->drupalGet($book_nodes[4]->urlInfo()); - $this->assertRaw('[route.book_navigation]=0|2|7'); - } - - /** - * Tests saving the book outline on an empty book. - */ - function testEmptyBook() { - // Create a new empty book. - $this->drupalLogin($this->bookAuthor); - $book = $this->createBookNode('new'); - $this->drupalLogout(); - - // Log in as a user with access to the book outline and save the form. - $this->drupalLogin($this->adminUser); - $this->drupalPostForm('admin/structure/book/' . $book->id(), array(), t('Save book pages')); - $this->assertText(t('Updated book @book.', array('@book' => $book->label()))); - } - - /** - * Tests book functionality through node interfaces. - */ - function testBook() { - // Create new book. - $nodes = $this->createBook(); - $book = $this->book; - - $this->drupalLogin($this->webUser); - - // Check that book pages display along with the correct outlines and - // previous/next links. - $this->checkBookNode($book, array($nodes[0], $nodes[3], $nodes[4]), FALSE, FALSE, $nodes[0], array()); - $this->checkBookNode($nodes[0], array($nodes[1], $nodes[2]), $book, $book, $nodes[1], array($book)); - $this->checkBookNode($nodes[1], NULL, $nodes[0], $nodes[0], $nodes[2], array($book, $nodes[0])); - $this->checkBookNode($nodes[2], NULL, $nodes[1], $nodes[0], $nodes[3], array($book, $nodes[0])); - $this->checkBookNode($nodes[3], NULL, $nodes[2], $book, $nodes[4], array($book)); - $this->checkBookNode($nodes[4], NULL, $nodes[3], $book, FALSE, array($book)); - - $this->drupalLogout(); - $this->drupalLogin($this->bookAuthor); - - // Check the presence of expected cache tags. - $this->drupalGet('node/add/book'); - $this->assertCacheTag('config:book.settings'); - - /* - * Add Node 5 under Node 3. - * Book - * |- Node 0 - * |- Node 1 - * |- Node 2 - * |- Node 3 - * |- Node 5 - * |- Node 4 - */ - $nodes[] = $this->createBookNode($book->id(), $nodes[3]->book['nid']); // Node 5. - $this->drupalLogout(); - $this->drupalLogin($this->webUser); - // Verify the new outline - make sure we don't get stale cached data. - $this->checkBookNode($nodes[3], array($nodes[5]), $nodes[2], $book, $nodes[5], array($book)); - $this->checkBookNode($nodes[4], NULL, $nodes[5], $book, FALSE, array($book)); - $this->drupalLogout(); - // Create a second book, and move an existing book page into it. - $this->drupalLogin($this->bookAuthor); - $other_book = $this->createBookNode('new'); - $node = $this->createBookNode($book->id()); - $edit = array('book[bid]' => $other_book->id()); - $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save')); - - $this->drupalLogout(); - $this->drupalLogin($this->webUser); - - // Check that the nodes in the second book are displayed correctly. - // First we must set $this->book to the second book, so that the - // correct regex will be generated for testing the outline. - $this->book = $other_book; - $this->checkBookNode($other_book, array($node), FALSE, FALSE, $node, array()); - $this->checkBookNode($node, NULL, $other_book, $other_book, FALSE, array($other_book)); - - // Test that we can save a book programatically. - $this->drupalLogin($this->bookAuthor); - $book = $this->createBookNode('new'); - $book->save(); - } - - /** - * Checks the outline of sub-pages; previous, up, and next. - * - * Also checks the printer friendly version of the outline. - * - * @param \Drupal\Core\Entity\EntityInterface $node - * Node to check. - * @param $nodes - * Nodes that should be in outline. - * @param $previous - * (optional) Previous link node. Defaults to FALSE. - * @param $up - * (optional) Up link node. Defaults to FALSE. - * @param $next - * (optional) Next link node. Defaults to FALSE. - * @param array $breadcrumb - * The nodes that should be displayed in the breadcrumb. - */ - function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) { - // $number does not use drupal_static as it should not be reset - // since it uniquely identifies each call to checkBookNode(). - static $number = 0; - $this->drupalGet('node/' . $node->id()); - - // Check outline structure. - if ($nodes !== NULL) { - $this->assertPattern($this->generateOutlinePattern($nodes), format_string('Node @number outline confirmed.', array('@number' => $number))); - } - else { - $this->pass(format_string('Node %number does not have outline.', array('%number' => $number))); - } - - // Check previous, up, and next links. - if ($previous) { - /** @var \Drupal\Core\Url $url */ - $url = $previous->urlInfo(); - $url->setOptions(array('attributes' => array('rel' => array('prev'), 'title' => t('Go to previous page')))); - $text = SafeMarkup::format('‹ @label', array('@label' => $previous->label())); - $this->assertRaw(\Drupal::l($text, $url), 'Previous page link found.'); - } - - if ($up) { - /** @var \Drupal\Core\Url $url */ - $url = $up->urlInfo(); - $url->setOptions(array('attributes' => array('title' => t('Go to parent page')))); - $this->assertRaw(\Drupal::l('Up', $url), 'Up page link found.'); - } - - if ($next) { - /** @var \Drupal\Core\Url $url */ - $url = $next->urlInfo(); - $url->setOptions(array('attributes' => array('rel' => array('next'), 'title' => t('Go to next page')))); - $text = SafeMarkup::format('@label ›', array('@label' => $next->label())); - $this->assertRaw(\Drupal::l($text, $url), 'Next page link found.'); - } - - // Compute the expected breadcrumb. - $expected_breadcrumb = array(); - $expected_breadcrumb[] = \Drupal::url('