mirror_php/minify
1
0
Fork 0
mirror of https://github.com/matthiasmullie/minify.git synced 2025-02-22 12:13:01 +01:00
Code Issues Packages Releases Wiki Activity
269 Commits 2 Branches 79 Tags
Commit Graph

269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Mullie
9e008d4335 Merge pull request #121 from alexcorvi/master 
extractRegex() pattern modified
 2016-09-14 10:40:45 +02:00
Matthias Mullie
51e5041cd2 End text files with newline 
SensioLabsInsight rightfully complained about this.
 2016-08-10 12:39:44 +02:00
Alex Corvi
ddfb6fc534 extractRegex() pattern modified 2016-07-03 13:00:36 +00:00
Matthias Mullie
ec046bd94a Merge pull request #118 from roggeo/master 
More JS keywords reserved
 2016-06-30 07:52:26 +02:00
Geovani
7c8df79c1c more keywords reserved 2016-06-29 23:20:38 -03:00
Geovani
f34438d734 More JS keywords reserved 2016-06-29 23:15:37 -03:00
Geovani
58cb641e12 more keywords reserved 2016-06-29 00:43:12 -03:00
Matthias Mullie
3253a81d07 Shorten colors some more if their color name is shorter 
As suggested on issue #109
1.3.35 		2016-06-09 21:35:54 +02:00
Matthias Mullie
1a152541b0 Shorten font weights 
As suggested on issue #109
 2016-06-09 21:34:19 +02:00
Matthias Mullie
dcdedb0389 Improve regex extraction 
Fixes issue #115
 2016-06-09 21:04:46 +02:00
Matthias Mullie
2552412426 Also don't fork if it's simply not available 2016-06-09 19:01:25 +02:00
Matthias Mullie
8f76616c40 Don't run fork test on HHVM 2016-06-09 18:05:40 +02:00
Matthias Mullie
75eff20d29 Suppress is_file errors, which may be caused by open_basedir 
Fixes issue #111
 2016-06-09 17:53:59 +02:00
Matthias Mullie
9c9c286776 Add tests for issue #108 2016-04-27 13:12:17 +02:00
Matthias Mullie
10b843d564 Add tests for issue #107 2016-04-27 13:06:55 +02:00
Matthias Mullie
ed61e52fd7 Add tests for issue #104 2016-04-27 12:56:10 +02:00
Matthias Mullie
c7ac2ecd40 Add tests for issue #103 2016-04-27 12:53:57 +02:00
Matthias Mullie
42bcd8c16e Add tests for issue #102 2016-04-27 12:49:27 +02:00
Matthias Mullie
8fa45a1be0 Add test for issue #100 2016-04-27 12:40:09 +02:00
Matthias Mullie
272e461134 Fix '0' being replaces by first string's value 
Fixes #99
1.3.34 		2016-03-01 09:00:27 +01:00
Matthias Mullie
3176239d15 PHPDoc cleanup 1.3.33 2016-02-17 15:39:47 +01:00
Matthias Mullie
61625a6bcd Missed a merge conflict... 2016-02-17 15:33:52 +01:00
Matthias Mullie
cad5d7f21f Merge branch 'GinoPane-master' 2016-02-17 14:30:18 +01:00
Matthias Mullie
74549d643a Add contributing instructions 2016-02-17 14:29:52 +01:00
Matthias Mullie
26a37282ae Add symlink converter to appveyor config 2016-02-17 14:27:03 +01:00
Matthias Mullie
a1a82c0787 Prefer portable shebang 2016-02-17 14:26:14 +01:00
Matthias Mullie
dc60e15734 Detect circular reference by passing data around 
Stuffing paths in statics could affect other instances of the
same class
 2016-02-17 14:23:55 +01:00
Matthias Mullie
da79c42fc5 Install mbstring 2016-02-17 14:03:43 +01:00
Matthias Mullie
3518f595e5 Restore original Exception class 
I admit, having just this 1 Exception class in the root of the
project was a bad idea...
But now I can't take it away without breaking backwards compatibility:
people could be catching errors of this class.
So all new Exception classes have to inherit from this old one (it's
not worth breaking BC over, imo)
Also renamed the new ones to be "Exceptions" (plural), to avoid
confusing that namespace with the original exception class name.
 2016-02-17 11:43:01 +01:00
Matthias Mullie
a6ebb921cb Add argument type to phpdoc 
Meanwhile also removed some superfluous braces
 2016-02-17 10:35:53 +01:00
Matthias Mullie
c17eb048da Restore earlier method of safeguarding newlines after regex 
This replacement was a bit unsafe as it could confuse devision /
for end-of-regex
 2016-02-17 10:09:38 +01:00
Matthias Mullie
b0c3c1a522 Restore original test 2016-02-17 10:04:30 +01:00
Matthias Mullie
2053c04da5 Spaces after // 2016-02-17 09:59:34 +01:00
Matthias Mullie
b77673f350 php-cs-fixer fixes 2016-02-17 09:58:12 +01:00
Matthias Mullie
8a662c04b5 Don't ignore sample scripts 2016-02-17 09:56:53 +01:00
Matthias Mullie
0af40ce217 Add appveyor, for CI on Windows 2016-02-17 09:46:54 +01:00
Matthias Mullie
51c3c73937 Add appveyor, for CI on Windows 2016-02-17 09:45:05 +01:00
Gino Pane
ea2512a67c Restore visibility of hidden property. 2016-02-15 23:05:13 +03:00
Gino Pane
3bdbbe1d3a Merge branch 'feature/test-file-load-loops' 2016-02-15 22:57:12 +03:00
Gino Pane
84a18b008d Restore .gitignore state 2016-02-15 22:56:45 +03:00
Gino Pane
4049b6eed3 Test and prevent file import loops. 
Issue: https://github.com/matthiasmullie/minify/issues/96

Updates:
- Added css files for testing and a new test-case;
- created new exception types and grouped them into separated directory;
- reuse some parts of the code.
 2016-02-15 22:56:01 +03:00
Gino Pane
51bb79449d Add temporary test 2016-02-15 00:54:21 +03:00
Gino Pane
353acbad32 Improve Minify::writeToFile check conditions. 
Notes:
PHP's fwrite only returns false if you call this function with an invalid argument. If any other error occurs it will return the number of bytes that has been written. So we have to add another check.
 2016-02-13 23:22:27 +03:00
Gino Pane
0ae8d9b95e Merge branch 'feature/increase-code-coverage' 2016-02-09 17:12:46 +03:00
Gino Pane
db9383b8aa Increase code coverage. 
- Fix contents of "tests\css\sample\convert_relative_path\source\absolute.css" to test @import without url();
- Change index in array of matches (Minify.php:321) to correctly replace empty strings.
 2016-02-09 17:12:30 +03:00
Gino Pane
08b5c43285 Merge branch 'feature/test-exceptions' 2016-02-09 15:53:32 +03:00
Gino Pane
ddfe262a62 Tests for filesystem operations. 
- Split Minify::save() to easily testable methods;
- Add tests.
 2016-02-09 15:53:15 +03:00
Gino Pane
a51f4eb6d9 Merge branch 'feature/fix-tests' 2016-02-09 01:37:26 +03:00
Gino Pane
424a43fc8b Fix regex for matching regexes. 2016-02-09 01:37:05 +03:00
Gino Pane
fcc27e7990 Update comment, fix typo. 2016-02-09 00:52:06 +03:00