Skip to content

Commit

Permalink
Merge pull request #3555 from CalderaWP/feature/3554-1.9.0-build
Browse files Browse the repository at this point in the history
Readme 1.9.0
  • Loading branch information
New0 authored Jun 18, 2020
2 parents c9db0f1 + f19ed73 commit 6ceebc4
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 40 deletions.
2 changes: 1 addition & 1 deletion assets/build/css/caldera-forms-front.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/caldera-forms-front.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/caldera-forms-front.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0-b2 - 2020-06-11 */var resBaldrickTriggers;
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0 - 2020-06-18 */var resBaldrickTriggers;

jQuery(function($){
function fieldErrors(fields, $form, $notice) {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/entry-viewer-2.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0-b2 - 2020-06-11 *//**
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0 - 2020-06-18 *//**
* API Client for Caldera Forms API for a single form
*
* @since 1.5.0
Expand Down
2 changes: 1 addition & 1 deletion assets/js/parsley.min.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0-b2 - 2020-06-11 *//*!
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0 - 2020-06-18 *//*!
* Parsley.js
* Version 2.8.1 - built Sat, Feb 3rd 2018, 2:27 pm
* http://parsleyjs.org
Expand Down
2 changes: 1 addition & 1 deletion assets/js/vue.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0-b2 - 2020-06-11 *//*!
/*! GENERATED SOURCE FILE caldera-forms - v1.9.0 - 2020-06-18 *//*!
* Vue.js v2.1.6
* (c) 2014-2016 Evan You
* Released under the MIT License.
Expand Down
4 changes: 2 additions & 2 deletions caldera-core.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: https://CalderaForms.com
Description: Easy to use, grid based responsive form builder for creating simple to complex forms.
Author: Caldera Forms
Version: 1.9.0-b2
Version: 1.9.0
Author URI: https://CalderaForms.com
Text Domain: caldera-forms
GitHub Plugin URI: https://github.com/CalderaWP/caldera-forms
Expand Down Expand Up @@ -53,7 +53,7 @@ function caldera_forms_wp_version_nag(){
} else {
define('CFCORE_PATH', plugin_dir_path(__FILE__));
define('CFCORE_URL', plugin_dir_url(__FILE__));
define( 'CFCORE_VER', '1.9.0-b2' );
define( 'CFCORE_VER', '1.9.0' );
define('CFCORE_EXTEND_URL', 'https://api.calderaforms.com/1.0/');
define('CFCORE_BASENAME', plugin_basename(__FILE__));

Expand Down
13 changes: 7 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "caldera-forms",
"version": "1.9.0-b2",
"version": "1.9.0",
"description": "Apex WordPress Forms",
"main": "Gruntfile.js",
"repository": {
Expand Down
13 changes: 12 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: Shelob9, Desertsnowman, christiechirinos, andrewza, nahuelmahe
Tags: form, contact form, forms, form creator, form manager, mailchimp, paypal, stripe, login, payment, forms manager, forms creation
Requires at least: 5.2
Tested up to: 5.7
Stable tag: 1.9.0-b2
Stable tag: 1.9.0
License: GPLv2
Requires PHP: 5.6

Expand Down Expand Up @@ -770,6 +770,17 @@ This could also be a sign of a more serious issue on your server, but is probabl

== Changelog ==

= Caldera Forms 1.9.0 (June 18, 2020) Conditionals Improved =
See: [https://calderaforms.com/updates/caldera-forms-1-9-0](https://calderaforms.com/updates/caldera-forms-1-9-0?utm_source=dotOrg&utm_medium=plugins&utm_campaign=caldera-forms&utm_term=1-8-11)
* [Replace conditional logic and improve performance](https://github.com/CalderaWP/Caldera-Forms/pull/3519)
* [Set minimum WordPress version to 5.1.0](https://github.com/CalderaWP/Caldera-Forms/pull/3465)
* [Fixes deprecated warnings in PHP 7.4](https://github.com/CalderaWP/Caldera-Forms/pull/3539)
* [Prevent get_field_data() from always returning null for string form IDs](https://github.com/CalderaWP/Caldera-Forms/pull/3417)
* [Adapt to rawurlencode()](https://github.com/CalderaWP/Caldera-Forms/pull/3528)
* [Add/adjust escaping functions](https://github.com/CalderaWP/Caldera-Forms/pull/3524)
* [Update SendWP SDK](https://github.com/CalderaWP/Caldera-Forms/pull/3548)
* [add `Release Asset` header](https://github.com/CalderaWP/Caldera-Forms/pull/3367)

= Caldera Forms 1.8.11 (March 05, 2020) Two Fixes =
See: [https://calderaforms.com/updates/caldera-forms-1-8-11](https://calderaforms.com/updates/caldera-forms-1-8-11?utm_source=dotOrg&utm_medium=plugins&utm_campaign=caldera-forms&utm_term=1-8-11)
*["Add Condition" (in line) button is broken in processors](https://github.com/CalderaWP/Caldera-Forms/issues/3490)
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInita50e92eee71e266592a3ac6ef74f2f3f::getLoader();
return ComposerAutoloaderInit1593e2b99610fd28eb259186a47eebbd::getLoader();
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInita50e92eee71e266592a3ac6ef74f2f3f
class ComposerAutoloaderInit1593e2b99610fd28eb259186a47eebbd
{
private static $loader;

Expand All @@ -19,15 +19,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInita50e92eee71e266592a3ac6ef74f2f3f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit1593e2b99610fd28eb259186a47eebbd', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInita50e92eee71e266592a3ac6ef74f2f3f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit1593e2b99610fd28eb259186a47eebbd', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
Expand All @@ -48,19 +48,19 @@ public static function getLoader()
$loader->register(true);

if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirea50e92eee71e266592a3ac6ef74f2f3f($fileIdentifier, $file);
composerRequire1593e2b99610fd28eb259186a47eebbd($fileIdentifier, $file);
}

return $loader;
}
}

function composerRequirea50e92eee71e266592a3ac6ef74f2f3f($fileIdentifier, $file)
function composerRequire1593e2b99610fd28eb259186a47eebbd($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
Expand Down
12 changes: 6 additions & 6 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f
class ComposerStaticInit1593e2b99610fd28eb259186a47eebbd
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
Expand Down Expand Up @@ -720,11 +720,11 @@ class ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::$prefixDirsPsr4;
$loader->fallbackDirsPsr4 = ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::$fallbackDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::$prefixesPsr0;
$loader->classMap = ComposerStaticInita50e92eee71e266592a3ac6ef74f2f3f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::$prefixDirsPsr4;
$loader->fallbackDirsPsr4 = ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::$fallbackDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::$prefixesPsr0;
$loader->classMap = ComposerStaticInit1593e2b99610fd28eb259186a47eebbd::$classMap;

}, null, ClassLoader::class);
}
Expand Down
12 changes: 6 additions & 6 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -926,17 +926,17 @@
},
{
"name": "symfony/translation",
"version": "v3.4.40",
"version_normalized": "3.4.40.0",
"version": "v3.4.42",
"version_normalized": "3.4.42.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "4e844362f573713e6d45949795c95a4cb6cf760d"
"reference": "b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/4e844362f573713e6d45949795c95a4cb6cf760d",
"reference": "4e844362f573713e6d45949795c95a4cb6cf760d",
"url": "https://api.github.com/repos/symfony/translation/zipball/b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f",
"reference": "b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f",
"shasum": ""
},
"require": {
Expand All @@ -963,7 +963,7 @@
"symfony/config": "",
"symfony/yaml": ""
},
"time": "2020-04-12T16:39:58+00:00",
"time": "2020-05-30T18:58:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down
4 changes: 2 additions & 2 deletions vendor/symfony/translation/Loader/XliffFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain)
try {
$dom = XmlUtils::loadFile($resource);
} catch (\InvalidArgumentException $e) {
throw new InvalidResourceException(sprintf('Unable to load "%s": '.$e->getMessage(), $resource), $e->getCode(), $e);
throw new InvalidResourceException(sprintf('Unable to load "%s": ', $resource).$e->getMessage(), $e->getCode(), $e);
}

$xliffVersion = $this->getVersionNumber($dom);
Expand Down Expand Up @@ -194,7 +194,7 @@ private function validateSchema($file, \DOMDocument $dom, $schema)
if (!@$dom->schemaValidateSource($schema)) {
libxml_disable_entity_loader($disableEntities);

throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: '.implode("\n", $this->getXmlErrors($internalErrors)), $file));
throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: ', $file).implode("\n", $this->getXmlErrors($internalErrors)));
}

libxml_disable_entity_loader($disableEntities);
Expand Down
2 changes: 1 addition & 1 deletion vendor/symfony/translation/Loader/YamlFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected function loadResource($resource)
try {
$messages = $this->yamlParser->parseFile($resource);
} catch (ParseException $e) {
throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s".', $resource), 0, $e);
throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML: ', $resource).$e->getMessage(), 0, $e);
} finally {
restore_error_handler();
}
Expand Down
11 changes: 11 additions & 0 deletions vendor/symfony/translation/Tests/TranslatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Symfony\Component\Translation\Tests;

use PHPUnit\Framework\TestCase;
use Symfony\Component\Translation\Exception\RuntimeException;
use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\MessageCatalogue;
use Symfony\Component\Translation\Translator;
Expand Down Expand Up @@ -552,6 +553,16 @@ public function testTransChoiceFallbackWithNoTranslation()
// unchanged if it can't be found
$this->assertEquals('some_message2', $translator->transChoice('some_message2', 10, ['%count%' => 10]));
}

public function testMissingLoaderForResourceError()
{
$this->expectException(RuntimeException::class);
$this->expectExceptionMessage('No loader is registered for the "twig" format when loading the "messages.en.twig" resource.');

$translator = new Translator('en');
$translator->addResource('twig', 'messages.en.twig', 'en');
$translator->getCatalogue('en');
}
}

class StringClass
Expand Down
6 changes: 5 additions & 1 deletion vendor/symfony/translation/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,11 @@ private function doLoadCatalogue($locale)
if (isset($this->resources[$locale])) {
foreach ($this->resources[$locale] as $resource) {
if (!isset($this->loaders[$resource[0]])) {
throw new RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
if (\is_string($resource[1])) {
throw new RuntimeException(sprintf('No loader is registered for the "%s" format when loading the "%s" resource.', $resource[0], $resource[1]));
}

throw new RuntimeException(sprintf('No loader is registered for the "%s" format.', $resource[0]));
}
$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
}
Expand Down

0 comments on commit 6ceebc4

Please sign in to comment.