Updated Composer Dependencies

Views update Remove 'inline' when including files due to known bugs in Smarty 3.1.32 setMergeCompiledIncludes - smarty-php/smarty#435
WeAreAthlon · May 28, 2018 · 860ddc1 · 860ddc1
1 parent 8c5475a
commit 860ddc1
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 36 deletions.
diff --git a/cms/views/_layouts/404.html.tpl b/cms/views/_layouts/404.html.tpl
@@ -10,7 +10,7 @@
   <link href="{$_urls.assets}img/favicon.ico" rel="shortcut icon" type="image/x-icon">
 </head>
 <body>
-{include '_shared/navigation-top.html.tpl' inline}
+{include '_shared/navigation-top.html.tpl'}
 <div class="container">
   <div class="row">
     <div class="col-lg-12">
@@ -23,7 +23,7 @@
       </p>
     </div>
   </div>
-  {include '_shared/footer.html.tpl' inline}
+  {include '_shared/footer.html.tpl'}
 </div>
 <!--[if lt IE 9]>
 {assets source=['vendor/afarkas/html5shiv/dist/html5shiv.min.js','vendor/rogeriopradoj/respond/dest/respond.min.js']}

diff --git a/cms/views/_layouts/default.html.tpl b/cms/views/_layouts/default.html.tpl
@@ -17,21 +17,21 @@
   </script>
 </head>
 <body>
-{include '_shared/navigation-top.html.tpl' inline}
+{include '_shared/navigation-top.html.tpl'}
 <div class="row no-margin row-offcanvas row-offcanvas-left">
   <div class="col-md-2 no-padding" role="navigation">
-    {include file='_shared/navigation-sidebar.html.tpl' inline}
+    {include file='_shared/navigation-sidebar.html.tpl'}
   </div>
   <div class="col-md-10 col-sm-12 col-xs-12">
     <div class="caption">
       {$smarty.capture.caption|default:{include file='_shared/caption.html.tpl'}}
     </div>
 
-    {include '_shared/flash-message.html.tpl' inline}
+    {include '_shared/flash-message.html.tpl'}
 
     {$_content_view_yield}
 
-    {include '_shared/footer.html.tpl' inline}
+    {include '_shared/footer.html.tpl'}
   </div>
 </div>
 {include '_shared/modals/default.html.tpl' type='inline'}

diff --git a/cms/views/_layouts/modal.html.tpl b/cms/views/_layouts/modal.html.tpl
@@ -1,2 +1,2 @@
-{include '_shared/flash-message.html.tpl' inline}
+{include '_shared/flash-message.html.tpl'}
 {$_content_view_yield}
diff --git a/cms/views/_layouts/public.html.tpl b/cms/views/_layouts/public.html.tpl
@@ -14,7 +14,7 @@
 <div class="container">
   <div class="content">
     <img src="{$_urls.assets}img/logo.png" alt="{$_labels.title|escape}" class="img-circle logo">
-    {include '_shared/flash-message.html.tpl' inline}
+    {include '_shared/flash-message.html.tpl'}
     {$_content_view_yield}
   </div>
 </div>

diff --git a/cms/views/_shared/entities/form/form.html.tpl b/cms/views/_shared/entities/form/form.html.tpl
@@ -1,7 +1,7 @@
 {if "{$_controller}/_form/header.html.tpl"|template_exists}
   {capture name='caption'}{include "{$_controller}/_form/header.html.tpl"}{/capture}
 {else}
-  {capture name='caption'}{include '_shared/entities/form/header.html.tpl' inline}{/capture}
+  {capture name='caption'}{include '_shared/entities/form/header.html.tpl'}{/capture}
 {/if}
 <div class="row">
   <div class="position-fixed-static" data-offset-top="50">
@@ -44,7 +44,7 @@
         {if "{$_controller}/_form/actions.html.tpl"|template_exists}
           {include "{$_controller}/_form/actions.html.tpl"}
         {else}
-          {include '_shared/entities/form/actions.html.tpl' inline}
+          {include '_shared/entities/form/actions.html.tpl'}
         {/if}
       </div>
     </div>
@@ -55,5 +55,5 @@
 {if "{$_controller}/_form/footer.html.tpl"|template_exists}
   {include "{$_controller}/_form/footer.html.tpl"}
 {else}
-  {include '_shared/entities/form/footer.html.tpl' inline}
+  {include '_shared/entities/form/footer.html.tpl'}
 {/if}
diff --git a/cms/views/_shared/entities/list/_table.html.tpl b/cms/views/_shared/entities/list/_table.html.tpl
@@ -32,7 +32,7 @@
 </thead>
 <tfoot>
 <tr>
-  <td colspan="{1 + $fields_to_display|@count}" class="table-actions">
+  <td colspan="{1 + {$fields_to_display|@count}}" class="table-actions">
     <div class="navbar navbar-default navbar-fixed-bottom navbar-listing-tools" role="navigation">
       <div class="navbar-header width-full padding-full">
         <div class="row">

diff --git a/cms/views/_shared/entities/list/_tbody.html.tpl b/cms/views/_shared/entities/list/_tbody.html.tpl
@@ -38,7 +38,7 @@
   </tr>
   {foreachelse}
   <tr>
-    <td colspan="{1 + $fields_to_display|@count}" class="text-muted text-center text-thin">
+    <td colspan="{1 + {$fields_to_display|@count}}" class="text-muted text-center text-thin">
       <p>
         <br>
         <i class="font-size-bigger glyphicon glyphicon-{$_labels.modules.$_controller.icon}"></i>
@@ -51,7 +51,7 @@
 {/foreach}
 {if $resources->getCount()}
   <tr>
-    <td colspan="{1 + $fields_to_display|@count}" class="table-summary text-thin accent text-muted">
+    <td colspan="{1 + {$fields_to_display|@count}}" class="table-summary text-thin accent text-muted">
       {assign var=per_page value={$_get.query.pagination.limit|default:current($_labels.pagination.limits)}}
       {$_labels.datatable.totals|sprintf:{max(($resources->paginate()->current()->pageNumber - 1) * $per_page + 1, 1)}:{min($resources->paginate()->current()->pageNumber * $per_page, $resources->paginate()->totalItems())}:{$resources->paginate()->totalItems()}}
     </td>

diff --git a/cms/views/_shared/entities/list/list.html.tpl b/cms/views/_shared/entities/list/list.html.tpl
@@ -1,7 +1,7 @@
 {if "{$_controller}/_list/header.html.tpl"|template_exists}
   {capture name='caption'}{include "{$_controller}/_list/header.html.tpl"}{/capture}
 {else}
-  {capture name='caption'}{include '_shared/entities/list/header.html.tpl' inline}{/capture}
+  {capture name='caption'}{include '_shared/entities/list/header.html.tpl'}{/capture}
 {/if}
 
 <div class="data-table-wrapper row">
@@ -13,15 +13,15 @@
   {/foreach}
   <div class="table-responsive">
     <table class="table table-striped table-hover data-table data-table-{$_controller}" data-offset-top="50" data-url-source="{$_request->meta('REQUEST_URI')}" data-url-export="{link_to controller=$_controller action=export}" data-controller="{$_controller}" data-type="{$type|default:'xhr'}" data-default-filtering='{$filtering_default|default:false|json_encode}'>
-      {include file='_shared/entities/list/_table.html.tpl' inline}
+      {include file='_shared/entities/list/_table.html.tpl'}
     </table>
   </div>
 </div>
 
 {if "{$_controller}/_list/footer.html.tpl"|template_exists}
   {include "{$_controller}/_list/footer.html.tpl"}
 {else}
-  {include '_shared/entities/list/footer.html.tpl' inline}
+  {include '_shared/entities/list/footer.html.tpl'}
 {/if}
 
 {if {user_can controller=$_controller action=show}}

diff --git a/cms/views/_shared/entities/show/show.html.tpl b/cms/views/_shared/entities/show/show.html.tpl
@@ -61,11 +61,11 @@
 {if "{$_controller}/_show/footer.html.tpl"|template_exists}
   {include "{$_controller}/_show/footer.html.tpl"}
 {else}
-  {include '_shared/entities/show/footer.html.tpl' inline}
+  {include '_shared/entities/show/footer.html.tpl'}
 {/if}
 
 {if "{$_controller}/_show/actions.html.tpl"|template_exists}
   {include "{$_controller}/_show/actions.html.tpl"}
 {else}
-  {include '_shared/entities/show/actions.html.tpl' inline}
+  {include '_shared/entities/show/actions.html.tpl'}
 {/if}
diff --git a/cms/views/_shared/navigation-top.html.tpl b/cms/views/_shared/navigation-top.html.tpl
@@ -14,9 +14,7 @@
     {if $_action neq '404'}
       <ol class="navbar-nav breadcrumb no-margin no-background text-thin hidden-xs">
         <li></li>
-        <li>
-          <a href="{link_to controller=$_controller action=index}">{$_labels.modules.$_controller.title|default:''}</a>
-        </li>
+        <li><a href="{link_to controller=$_controller action=index}">{$_labels.modules.$_controller.title|default:''}</a></li>
         <li class="active">{$_labels.modules.$_controller.$_action|default:$_labels.sections.$_action|default:''}</li>
       </ol>
     {/if}

diff --git a/cms/views/authentication/login.html.tpl b/cms/views/authentication/login.html.tpl
@@ -9,7 +9,7 @@
     <input name="password" type="password" id="password" class="form-control text-thin" placeholder="..." autocomplete="off" tabindex="2">
   </div>
   {if $captchaTemplate|default:false}
-    {include 'authentication/_captcha.html.tpl' inline}
+    {include 'authentication/_captcha.html.tpl'}
   {/if}
   <div class="form-group clearfix">
     <div class="text-center">

diff --git a/cms/views/authentication/reset.html.tpl b/cms/views/authentication/reset.html.tpl
@@ -6,7 +6,7 @@
       <p class="text-thin">{$_labels.reset.instructions}</p>
     </div>
     {if $captchaTemplate|default:false}
-      {include 'authentication/_captcha.html.tpl' inline}
+      {include 'authentication/_captcha.html.tpl'}
     {/if}
     <div class="text-center">
       <button class="btn btn-outline btn-primary text-thin" type="submit">

diff --git a/composer.json b/composer.json
@@ -53,28 +53,28 @@
         "ext-PDO"               : "*",
         "ext-mbstring"          : "*",
         "ext-gd"                : "*",
-        "smarty/smarty"         : "v3.1.31",
-        "phpmailer/phpmailer"   : "v5.2.25",
+        "smarty/smarty"         : "v3.1.32",
+        "phpmailer/phpmailer"   : "v5.2.26",
         "mustangostang/spyc"    : "0.6.2",
         "imagine/imagine"       : "v0.7.1",
-        "tecnickcom/tcpdf"      : "6.2.13",
+        "tecnickcom/tcpdf"      : "6.2.17",
         "recaptcha/php5"        : "2.0.0",
         "kriswallsmith/assetic" : "1.4.0",
         "lmammino/jsmin4assetic": "1.0.0",
-        "natxet/CssMin"         : "v3.0.4",
+        "natxet/CssMin"         : "v3.0.6",
         "icanboogie/inflector"  : "*",
-        "erusev/parsedown"      : "1.6.3",
+        "erusev/parsedown"      : "1.7.1",
         "components/jquery"     : "1.12.4",
         "components/bootstrap"  : "3.3.7",
-        "drmonty/ekko-lightbox" : "5.2.0",
+        "drmonty/ekko-lightbox" : "5.3.0",
         "pnikolov/bootstrap-chosen" : "1.5.1",
         "pnikolov/bootstrap-daterangepicker" : "*",
         "pnikolov/bootbox"      : "4.4.0",
         "pnikolov/bootstrap-maxlength" : "1.7.0",
         "pnikolov/jquery-serialize-object": "2.5.0",
         "pnikolov/spin.js"  : "2.3.2",
-        "itsjavi/bootstrap-colorpicker": "2.4.0",
-        "eonasdan/bootstrap-datetimepicker": "4.17.37",
+        "itsjavi/bootstrap-colorpicker": "2.5.2",
+        "eonasdan/bootstrap-datetimepicker": "4.17.47",
         "afarkas/html5shiv"     : "3.7.3",
         "rogeriopradoj/respond" : "1.4.2"
     },

diff --git a/configurations/development/configuration.php b/configurations/development/configuration.php
@@ -113,11 +113,11 @@ class Configuration extends Configurations\Staging\Configuration
      */
     public $DB = array(
         'adapter'        => 'pdo_mysql',
-        'host'           => '<DB_HOST>',
+        'host'           => 'localhost',
         'port'           => 3306,
-        'user'           => '<DB_USER>',
-        'password'       => '<DB_PASSWORD>',
-        'name'           => '<DB_NAME>',
+        'user'           => 'root',
+        'password'       => 'Erovete13!',
+        'name'           => 'silla_io',
         'tables_prefix'  => '',
         'encryption_key' => '25c6c7ff35bd13b0ff9979b151f2136c',
         'crypt_vector'   => 'dasn312321nssa1k',

diff --git a/core/modules/render/adapters/smarty.php b/core/modules/render/adapters/smarty.php
@@ -30,6 +30,8 @@ class Smarty implements Core\Modules\Render\Interfaces\Adapter
      *
      * @param array $config  Template configuration.
      * @param array $options Additional options.
+     *
+     * @throws \SmartyException if filter could not be loaded
      */
     public function __construct(array $config, array $options = array())
     {