Merge branch '8.x-2.x' of git.drupal.org:project/file_entity into 8.x-2.x

Author: slashrsm

config/schema/file_entity.schema.yml

@@ -119,3 +119,23 @@ action.configuration.file_temporary_action:
 field.widget.settings.file_editable:
   type: field.widget.settings.file_generic
   label: 'File format settings'
+
+field.widget.settings.file_entity_browser:
+  type: mapping
+  label: 'File entity browser settings'
+  mapping:
+    entity_browser:
+      type: string
+      label: 'Entity browser'
+    field_widget_edit:
+      type: boolean
+      label: 'Display edit button'
+    field_widget_remove:
+      type: boolean
+      label: 'Display remove button'
+    open:
+      type: boolean
+      label: 'Show widget details as open by default'
+    view_mode:
+      type: string
+      label: 'View mode'

file_entity.info.yml

@@ -9,3 +9,5 @@ dependencies:
   - views
   - image
 configure: file_entity.settings
+test_dependencies:
+  - pathauto

file_entity.install

@@ -88,3 +88,13 @@ function file_entity_uninstall() {
   // Remove the added column to the core {file_managed} table.
   db_drop_field('file_managed', 'type');
 }
+/**
+ * Update existing bogus entries for File types Document.
+ */
+function file_entity_update_8002(&$sandbox) {
+  foreach (\Drupal::configFactory()->listAll('file_entity') as $config_name) {
+    $config = \Drupal::configFactory()->getEditable($config_name);
+    $config->set('mimetypes', str_replace("\r", "", $config->get('mimetypes')));
+    $config->save();
+  }
+}

file_entity.services.yml

@@ -0,0 +1,5 @@
+services:
+  file_entity.route_subscriber:
+    class: Drupal\file_entity\Routing\RouteSubscriber
+    tags:
+      - { name: event_subscriber }

src/Form/FileSettingsForm.php

@@ -5,14 +5,15 @@
  */
 
 namespace Drupal\file_entity\Form;
-use Drupal\Core\Form\FormBase;
+
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Class FileSettingsForm
  * @package Drupal\file_entity\Form
  */
-class FileSettingsForm extends FormBase {
+class FileSettingsForm extends ConfigFormBase {
 
   /**
    * Returns a unique string identifying the form.
@@ -24,6 +25,15 @@ public function getFormId() {
     return 'file_settings';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames() {
+    return [
+      'file_entity.settings',
+    ];
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -33,7 +43,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#title' => t('Maximum upload size'),
       '#default_value' => \Drupal::config('file_entity.settings')->get('max_filesize'),
       '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current max limit <strong>%limit</strong>).', array('%limit' => format_size(file_upload_max_size()))),
-      '#element_validate' => '\Drupal\file\Plugin\Field\FieldType\FileItem::validateMaxFilesize',
+      '#element_validate' => ['\Drupal\file\Plugin\Field\FieldType\FileItem::validateMaxFilesize'],
       '#size' => 10,
     );
 
@@ -42,7 +52,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#title' => t('Default allowed file extensions'),
       '#default_value' => \Drupal::config('file_entity.settings')->get('default_allowed_extensions'),
       '#description' => t('Separate extensions with a space or comma and do not include the leading dot.'),
-      '#element_validate' => '\Drupal\file\Plugin\Field\FieldType\FileItem::validateExtensions',
+      '#element_validate' => ['\Drupal\file\Plugin\Field\FieldType\FileItem::validateExtensions'],
       '#maxlength' => NULL,
     );
 

src/Form/FileTypeForm.php

@@ -131,7 +131,7 @@ protected function copyFormValuesToEntity(EntityInterface $entity, array $form,
     // Convert multi-line string to array before copying.
     // This may be called multiple times and exectued only if it is a string.
     if (is_string($form_state->getValue('mimetypes'))) {
-      $form_state->setValue('mimetypes', explode("\n", $form_state->getValue('mimetypes')));
+      $form_state->setValue('mimetypes', explode("\n", str_replace("\r", "", $form_state->getValue('mimetypes'))));
     }
     parent::copyFormValuesToEntity($entity, $form, $form_state);
   }

src/Plugin/Field/FieldWidget/FileEntityBrowser.php

@@ -45,6 +45,11 @@ class FileEntityBrowser extends EntityReference {
    */
   public static function defaultSettings() {
     $settings = parent::defaultSettings();
+
+    // These settings are hidden.
+    unset($settings['field_widget_display']);
+    unset($settings['field_widget_display_settings']);
+
     $settings['view_mode'] = 'thumbnail';
     return $settings;
   }

src/Routing/RouteSubscriber.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\file_entity\Routing\RouteSubscriber.
+ */
+
+namespace Drupal\file_entity\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Listens to the dynamic route events.
+ */
+class RouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function alterRoutes(RouteCollection $collection) {
+    // The usage view should be shown in the admin theme.
+    if ($route = $collection->get('view.file_entity_files.usage')) {
+      $route->setOption('_admin_route', TRUE);
+    }
+  }
+}

src/Tests/FileEntityNormalizerTest.php renamed to tests/src/Kernel/FileEntityNormalizerTest.php

@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\file_entity\Tests\FileEntityNormalizerTest.
+ * Contains \Drupal\Tests\file_entity\Kernel\FileEntityNormalizerTest.
  */
 
-namespace Drupal\file_entity\Tests;
+namespace Drupal\Tests\file_entity\Kernel;
 
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\field\Entity\FieldConfig;
@@ -13,7 +13,7 @@
 use Drupal\file_entity\Entity\FileType;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\system\Tests\Routing\MockRouteProvider;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
@@ -45,13 +45,6 @@ class FileEntityNormalizerTest extends KernelTestBase {
     'system',
   );
 
-  /**
-   * Disable strict schema checking until schema is updated.
-   *
-   * @todo Update schema and remove this.
-   */
-  protected $strictConfigSchema = FALSE;
-
   /**
    * {@inheritdoc}
    */