mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.0' into 4
This commit is contained in:
Daniel Hensby
commit
cf321895ba
@ -58,7 +58,6 @@ matrix:
|
||||
before_script:
|
||||
# Init PHP
|
||||
- pecl channel-update pecl.php.net
|
||||
- travis_retry printf "\n" | pecl install imagick
|
||||
- phpenv rehash
|
||||
- phpenv config-rm xdebug.ini || true
|
||||
- echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
|
||||
|
||||
@ -41,7 +41,7 @@ For those that use WAMP as a development environment, [detailed information is a
|
||||
Composer can create a new site for you, using the installer as a template (by default composer will download the latest stable version):
|
||||
|
||||
```
|
||||
composer create-project silverstripe/installer ./my/website/folder
|
||||
composer create-project silverstripe/installer ./my/website/folder ^4
|
||||
```
|
||||
|
||||
If you want to get all additional fixtures for testing, such as behat and phpunit configuration,
|
||||
@ -282,7 +282,7 @@ the latest unstable silverstripe/installer
|
||||
composer create-project silverstripe/installer ./my/website/folder dev-master
|
||||
```
|
||||
|
||||
Or for the latest development version in the 3.0.x series
|
||||
Or for the latest development version in the 4.0.x series
|
||||
|
||||
```
|
||||
composer create-project silverstripe/installer ./my/website/folder 4.0.x-dev
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# 4.0.0 (unreleased)
|
||||
# 4.0.0
|
||||
|
||||
## Introduction
|
||||
|
||||
@ -81,7 +81,6 @@ Backup your existing `composer.json` and overwrite it with the following content
|
||||
This composer file uses the new [recipe](https://github.com/silverstripe/recipe-plugin) approach
|
||||
which bundles all core dependencies in a meta package. If you want more granular control over what gets installed,
|
||||
check the `composer.json` files in [recipe-core](https://github.com/silverstripe/recipe-core) and [recipe-cms](https://github.com/silverstripe/recipe-cms).
|
||||
Since this is a pre-release, you need to allow composer to install unstable dependencies via `minimum-stability: dev`.
|
||||
|
||||
Now run a `composer update`. This will remove all existing modules from your local codebase
|
||||
since we replaced your project's `composer.json`. Now you can move back your modules
|
||||
@ -488,6 +487,7 @@ For instance, code which logs errors should be upgraded as below:
|
||||
```diff
|
||||
-SS_Log::log('My error message', SS_Log::ERR);
|
||||
+use Psr\Log\LoggerInterface;
|
||||
+use SilverStripe\Core\Injector\Injector;
|
||||
+Injector::inst()->get(LoggerInterface::class)->error('My error message');
|
||||
```
|
||||
|
||||
|
||||
@ -621,6 +621,12 @@ class Email extends ViewableData
|
||||
*/
|
||||
public function setBody($body)
|
||||
{
|
||||
$plainPart = $this->findPlainPart();
|
||||
if ($plainPart) {
|
||||
$this->getSwiftMessage()->detach($plainPart);
|
||||
}
|
||||
unset($plainPart);
|
||||
|
||||
$body = HTTP::absoluteURLs($body);
|
||||
$this->getSwiftMessage()->setBody($body);
|
||||
|
||||
@ -856,6 +862,12 @@ class Email extends ViewableData
|
||||
*/
|
||||
public function generatePlainPartFromBody()
|
||||
{
|
||||
$plainPart = $this->findPlainPart();
|
||||
if ($plainPart) {
|
||||
$this->getSwiftMessage()->detach($plainPart);
|
||||
}
|
||||
unset($plainPart);
|
||||
|
||||
$this->getSwiftMessage()->addPart(
|
||||
Convert::xml2raw($this->getBody()),
|
||||
'text/plain',
|
||||
|
||||
@ -343,12 +343,18 @@ class SapphireTest extends PHPUnit_Framework_TestCase implements TestOnly
|
||||
* - Custom state helpers
|
||||
*
|
||||
* User code should call parent::setUpBeforeClass() before custom setup code
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
// Start tests
|
||||
static::start();
|
||||
|
||||
if (!static::$state) {
|
||||
throw new Exception('SapphireTest failed to bootstrap!');
|
||||
}
|
||||
|
||||
// Call state helpers
|
||||
static::$state->setUpOnce(static::class);
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ class RequiredFields extends Validator
|
||||
/**
|
||||
* Clears all the validation from this object.
|
||||
*
|
||||
* @return RequiredFields
|
||||
* @return $this
|
||||
*/
|
||||
public function removeValidation()
|
||||
{
|
||||
@ -56,6 +56,7 @@ class RequiredFields extends Validator
|
||||
|
||||
/**
|
||||
* Debug helper
|
||||
* @return string
|
||||
*/
|
||||
public function debug()
|
||||
{
|
||||
@ -152,7 +153,7 @@ class RequiredFields extends Validator
|
||||
*
|
||||
* @param string $field
|
||||
*
|
||||
* @return RequiredFields
|
||||
* @return $this
|
||||
*/
|
||||
public function addRequiredField($field)
|
||||
{
|
||||
@ -166,7 +167,7 @@ class RequiredFields extends Validator
|
||||
*
|
||||
* @param string $field
|
||||
*
|
||||
* @return RequiredFields
|
||||
* @return $this
|
||||
*/
|
||||
public function removeRequiredField($field)
|
||||
{
|
||||
@ -179,7 +180,7 @@ class RequiredFields extends Validator
|
||||
* Add {@link RequiredField} objects together
|
||||
*
|
||||
* @param RequiredFields $requiredFields
|
||||
* @return RequiredFields
|
||||
* @return $this
|
||||
*/
|
||||
public function appendRequiredFields($requiredFields)
|
||||
{
|
||||
|
||||
@ -198,7 +198,7 @@ class DBText extends DBString
|
||||
$keywords = Convert::raw2xml($keywords);
|
||||
|
||||
// Find the search string
|
||||
$position = (int) stripos($text, $keywords);
|
||||
$position = (int) mb_stripos($text, $keywords);
|
||||
|
||||
// We want to search string to be in the middle of our block to give it some context
|
||||
$position = max(0, $position - ($characters / 2));
|
||||
@ -206,19 +206,19 @@ class DBText extends DBString
|
||||
if ($position > 0) {
|
||||
// We don't want to start mid-word
|
||||
$position = max(
|
||||
(int) strrpos(substr($text, 0, $position), ' '),
|
||||
(int) strrpos(substr($text, 0, $position), "\n")
|
||||
(int) mb_strrpos(substr($text, 0, $position), ' '),
|
||||
(int) mb_strrpos(substr($text, 0, $position), "\n")
|
||||
);
|
||||
}
|
||||
|
||||
$summary = substr($text, $position, $characters);
|
||||
$summary = mb_substr($text, $position, $characters);
|
||||
$stringPieces = explode(' ', $keywords);
|
||||
|
||||
if ($highlight) {
|
||||
// Add a span around all key words from the search term as well
|
||||
if ($stringPieces) {
|
||||
foreach ($stringPieces as $stringPiece) {
|
||||
if (strlen($stringPiece) > 2) {
|
||||
if (mb_strlen($stringPiece) > 2) {
|
||||
// Maintain case of original string
|
||||
$summary = preg_replace(
|
||||
'/' . preg_quote($stringPiece, '/') . '/i',
|
||||
|
||||
@ -41,6 +41,7 @@ class DBTextTest extends SapphireTest
|
||||
['The little brown fox jumped over the lazy cow.', 'The little brown fox...'],
|
||||
['<p>Short & Sweet</p>', '<p>Short & Sweet</p>'],
|
||||
['This text contains & in it', 'This text contains &...'],
|
||||
['Is an umault in schön?', 'Is an umault in schö...'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -80,7 +81,10 @@ class DBTextTest extends SapphireTest
|
||||
['<p>Lorem ipsum dolor sit amet</p>', 24, '<p>Lorem ipsum dolor...'],
|
||||
['<p><span>Lorem ipsum dolor sit amet</span></p>', 24, '<p><span>Lorem ipsum...'],
|
||||
['<p>Lorem ipsum</p>', 24, '<p>Lorem ipsum</p>'],
|
||||
['Lorem & ipsum dolor sit amet', 24, 'Lorem &amp; ipsum dolor...']
|
||||
['Lorem & ipsum dolor sit amet', 24, 'Lorem &amp; ipsum dolor...'],
|
||||
|
||||
['Is an umault in schön or not?', 22, 'Is an umault in schön...'],
|
||||
|
||||
];
|
||||
}
|
||||
|
||||
@ -124,6 +128,9 @@ class DBTextTest extends SapphireTest
|
||||
// If storing HTML you should use DBHTMLText instead
|
||||
['<p>Text inside a paragraph tag should also work</p>', 3, '<p>Text inside a...'],
|
||||
['<p>Two words</p>', 3, '<p>Two words</p>'],
|
||||
|
||||
// Check UTF8
|
||||
['Is an umault in schön or not?', 5, 'Is an umault in schön...'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -156,6 +163,9 @@ class DBTextTest extends SapphireTest
|
||||
// If storing HTML you should use DBHTMLText instead
|
||||
['<p>First sentence.</p>', 2, '<p>First sentence.</p>'],
|
||||
['<p>First sentence. Second sentence. Third sentence</p>', 2, '<p>First sentence. Second sentence.'],
|
||||
|
||||
// Check UTF8
|
||||
['Is schön. Isn\'t schön.', 1, 'Is schön.'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -187,6 +197,9 @@ class DBTextTest extends SapphireTest
|
||||
// If storing HTML you should use DBHTMLText instead
|
||||
['<br />First sentence.', '<br />First sentence.'],
|
||||
['<p>First sentence. Second sentence. Third sentence</p>', '<p>First sentence.'],
|
||||
|
||||
// Check UTF8
|
||||
['Is schön. Isn\'t schön.', 'Is schön.'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -243,7 +256,16 @@ class DBTextTest extends SapphireTest
|
||||
'ate',
|
||||
// it should highlight 3 letters or more.
|
||||
'A dog <mark>ate</mark> a cat while looking at a Foobar',
|
||||
],
|
||||
[
|
||||
'both schön and können have umlauts',
|
||||
21,
|
||||
'schön',
|
||||
// check UTF8 support
|
||||
'both <mark>schön</mark> and können...',
|
||||
]
|
||||
|
||||
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user