Merge pull request #60 from NuCivic/proposed_release_for_tag_1503498339

1503498339: Proposed release for 7.x-1.13.7
GetDKAN · Aug 23, 2017 · f93a835 · f93a835
2 parents 0bf96f1 + 37ce77f
commit f93a835
Show file tree

Hide file tree

Showing 84 changed files with 677 additions and 3,116 deletions.
diff --git a/profiles/dkan/CHANGELOG.txt b/profiles/dkan/CHANGELOG.txt
@@ -1,3 +1,10 @@
+7.x-1.13.7 2017-08-22
+---------------------
+ - #2064 Update entityreference to 1.15
+ - #2061 Update views to 3.17
+ - #2060 Update tests to adjust to client customizations.
+ - #2060 Removed unused modules menu_token and remote_file_source from drupal-org.make
+
 7.x-1.13.6 2017-07-28
 ---------------------
  - #2036 Add file_resup to the list of up to date projects.

diff --git a/profiles/dkan/dkan.info b/profiles/dkan/dkan.info
@@ -125,6 +125,6 @@ dependencies[] = dkan_datastore_api
 dependencies[] = open_data_schema_map_dkan
 dependencies[] = visualization_entity_charts_dkan
 
-; Information added by DKAN release script on 7/28/2017
-version = 7.x-1.13.6
+; Information added by DKAN release script on 8/23/2017
+version = 7.x-1.13.7
 project = dkan
diff --git a/profiles/dkan/docs/releases/notes/1.13.7.md b/profiles/dkan/docs/releases/notes/1.13.7.md
@@ -0,0 +1,9 @@
+# DKAN 1.13.7
+
+This is a "patch" release of DKAN, containing bug fixes and minor
+updates, but adding no new functionality.
+
+## Improvements in this release
+
+- Important security updates to 'views' and 'entityreference' modules. 
+- Multiple testing improvements.
diff --git a/profiles/dkan/drupal-org.make b/profiles/dkan/drupal-org.make
@@ -3,9 +3,9 @@ api: '2'
 core: 7.x
 includes:
 - https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-1.2/visualization_entity.make
-- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.13.6/open_data_schema_map.make
+- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/1.13.6/open_data_schema_map.make
 - https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/5a5f8faf664aeca02371f6692307580d9fab9116/leaflet_widget.make
-- https://raw.githubusercontent.com/NuCivic/recline/7.x-1.13.6/recline.make
+- https://raw.githubusercontent.com/NuCivic/recline/1.13.6/recline.make
 projects:
   admin_menu:
     version: 3.0-rc5
@@ -77,7 +77,7 @@ projects:
     patch:
       2809655: https://www.drupal.org/files/issues/entity-path-mysql-5-7_3.diff
   entityreference:
-    version: '1.4'
+    version: '1.5'
   entityreference_filter:
     version: '1.7'
   facetapi:
@@ -217,8 +217,6 @@ projects:
     version: '1.3'
   menu_block:
     version: '2.7'
-  menu_token:
-    version: 1.0-beta7
   migrate:
     version: '2.8'
     patch:
@@ -246,7 +244,7 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/open_data_schema_map.git
-      tag: 7.x-1.13.6
+      tag: 7.x-1.13.7
   panelizer:
     version: '3.4'
   panels:
@@ -276,18 +274,14 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/recline.git
-      tag: 7.x-1.13.6
+      tag: 7.x-1.13.7
   ref_field:
     download:
       type: git
       url: http://git.drupal.org/project/ref_field.git
       revision: 9dbf7cf
     patch:
       2360019: https://www.drupal.org/files/issues/ref_field-delete-insert-warning-2360019-5.patch
-  remote_file_source:
-    version: 1.x
-    patch:
-      2362487: https://www.drupal.org/files/issues/remote_file_source-location-content-dist_1.patch
   remote_stream_wrapper:
     download:
       type: git
@@ -329,13 +323,13 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/taxonomy_fixtures.git
-      revision: 485d92019d11a61de585707db8f49d0160bd03b2
+      revision: b2f092c963f4a24afe1e6443eb9ff01c959079ed
   token:
     version: '1.7'
   uuid:
     version: '1.0'
   views:
-    version: '3.16'
+    version: '3.17'
   views_autocomplete_filters:
     version: '1.2'
     patch:

diff --git a/profiles/dkan/libraries/symfonyserializer/Mapping/Loader/YamlFileLoader.php b/profiles/dkan/libraries/symfonyserializer/Mapping/Loader/YamlFileLoader.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Serializer\Mapping\AttributeMetadata;
 use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
 use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * YAML File Loader.
@@ -114,7 +113,7 @@ private function getClassesFromYaml()
             $this->yamlParser = new Parser();
         }
 
-        $classes = $this->yamlParser->parse(file_get_contents($this->file), Yaml::PARSE_KEYS_AS_STRINGS);
+        $classes = $this->yamlParser->parse(file_get_contents($this->file));
 
         if (empty($classes)) {
             return array();

diff --git a/profiles/dkan/libraries/symfonyserializer/Tests/Encoder/YamlEncoderTest.php b/profiles/dkan/libraries/symfonyserializer/Tests/Encoder/YamlEncoderTest.php
@@ -61,9 +61,11 @@ public function testContext()
         $obj = new \stdClass();
         $obj->bar = 2;
 
-        $this->assertEquals("    foo: !php/object:O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}\n", $encoder->encode(array('foo' => $obj), 'yaml'));
+        $legacyTag = "    foo: !php/object:O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}\n";
+        $spacedTag = "    foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'\n";
+        $this->assertThat($encoder->encode(array('foo' => $obj), 'yaml'), $this->logicalOr($this->equalTo($legacyTag), $this->equalTo($spacedTag)));
         $this->assertEquals('  { foo: null }', $encoder->encode(array('foo' => $obj), 'yaml', array('yaml_inline' => 0, 'yaml_indent' => 2, 'yaml_flags' => 0)));
-        $this->assertEquals(array('foo' => $obj), $encoder->decode('foo: !php/object:O:8:"stdClass":1:{s:3:"bar";i:2;}', 'yaml'));
-        $this->assertEquals(array('foo' => null), $encoder->decode('foo: !php/object:O:8:"stdClass":1:{s:3:"bar";i:2;}', 'yaml', array('yaml_flags' => 0)));
+        $this->assertEquals(array('foo' => $obj), $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml'));
+        $this->assertEquals(array('foo' => null), $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml', array('yaml_flags' => 0)));
     }
 }
diff --git a/profiles/dkan/libraries/symfonyserializer/composer.json b/profiles/dkan/libraries/symfonyserializer/composer.json
@@ -28,7 +28,7 @@
         "doctrine/annotations": "~1.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "doctrine/cache": "~1.0",
-        "phpdocumentor/reflection-docblock": "~3.0"
+        "phpdocumentor/reflection-docblock": "^3.0|^4.0"
     },
     "conflict": {
         "symfony/dependency-injection": "<3.4",

diff --git a/profiles/dkan/modules/contrib/entityreference/entityreference.info b/profiles/dkan/modules/contrib/entityreference/entityreference.info
@@ -29,9 +29,9 @@ files[] = tests/entityreference.admin.test
 files[] = tests/entityreference.feeds.test
 files[] = tests/entityreference.entity_translation.test
 
-; Information added by Drupal.org packaging script on 2017-05-23
-version = "7.x-1.4"
+; Information added by Drupal.org packaging script on 2017-08-16
+version = "7.x-1.5"
 core = "7.x"
 project = "entityreference"
-datestamp = "1495557187"
+datestamp = "1502895850"
 
diff --git a/profiles/dkan/modules/contrib/entityreference/entityreference.module b/profiles/dkan/modules/contrib/entityreference/entityreference.module
@@ -1,5 +1,7 @@
 <?php
 
+define('ENTITYREFERENCE_DENIED', '- Restricted access -');
+
 /**
  * @file
  * Entityreference primary module file.
@@ -1106,10 +1108,14 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
   if (isset($tag_last)) {
     // Get an array of matching entities.
     $entity_labels = $handler->getReferencableEntities($tag_last, $instance['widget']['settings']['match_operator'], 10);
-
+    $denied_label = t(ENTITYREFERENCE_DENIED);
     // Loop through the products and convert them into autocomplete output.
     foreach ($entity_labels as $values) {
       foreach ($values as $entity_id => $label) {
+        // Never autocomplete entities that aren't accessible.
+        if ($label == $denied_label) {
+          continue;
+        }
         $key = "$label ($entity_id)";
         // Strip starting/trailing white spaces, line breaks and tags.
         $key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(decode_entities(strip_tags($key)))));

diff --git a/...reference/examples/entityreference_behavior_example/entityreference_behavior_example.info b/...reference/examples/entityreference_behavior_example/entityreference_behavior_example.info
@@ -4,9 +4,9 @@ core = 7.x
 package = Fields
 dependencies[] = entityreference
 
-; Information added by Drupal.org packaging script on 2017-05-23
-version = "7.x-1.4"
+; Information added by Drupal.org packaging script on 2017-08-16
+version = "7.x-1.5"
 core = "7.x"
 project = "entityreference"
-datestamp = "1495557187"
+datestamp = "1502895850"
 
diff --git a/...trib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/...trib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
@@ -309,7 +309,7 @@ protected function reAlterQuery(SelectQueryInterface $query, $tag, $base_table)
    */
   public function getLabel($entity) {
     $target_type = $this->field['settings']['target_type'];
-    return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -');
+    return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED);
   }
 
   /**

diff --git a/profiles/dkan/modules/contrib/entityreference/tests/entityreference.handlers.test b/profiles/dkan/modules/contrib/entityreference/tests/entityreference.handlers.test
@@ -271,7 +271,7 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase {
         ),
         'result' => array(
           'user' => array(
-            $users['admin']->uid => '- Restricted access -',
+            $users['admin']->uid => ENTITYREFERENCE_DENIED,
             $users['non_admin']->uid => $user_labels['non_admin'],
           ),
         ),

diff --git a/.../entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info b/.../entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info
@@ -8,9 +8,9 @@ dependencies[] = feeds
 dependencies[] = feeds_ui
 dependencies[] = entityreference
 
-; Information added by Drupal.org packaging script on 2017-05-23
-version = "7.x-1.4"
+; Information added by Drupal.org packaging script on 2017-08-16
+version = "7.x-1.5"
 core = "7.x"
 project = "entityreference"
-datestamp = "1495557187"
+datestamp = "1502895850"