Skip to content

Commit ef7b41e

Browse files
php-coderphp-coder
committed
style: use FIXME in comments instead of TODO to unbreak 0pdd.
Adapt code base to backward incompatible changes in pdd/0pdd. See: yegor256/0pdd#260 No code changes.
1 parent 6f72c3b commit ef7b41e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+62
-62
lines changed

‎Dangerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ if File.file?(bootlint_output)
239239
file = github.html_link("#{file}#L#{lineno}")
240240
fail("bootlint error in #{file}:\n[#{code}](https://github.com/twbs/bootlint/wiki/#{code}): #{msg}")
241241
end
242-
# TODO: add link to wiki page (#316)
242+
# FIXME: add link to wiki page (#316)
243243
print_errors_summary 'bootlint', errors_count
244244
end
245245

@@ -292,7 +292,7 @@ if File.file?(shellcheck_output)
292292
file = github.html_link("#{file}#L#{lineno}")
293293
fail("shellcheck error in #{file}:\n[#{code}](https://github.com/koalaman/shellcheck/wiki/#{code}): #{msg}")
294294
end
295-
# TODO: add link to wiki page
295+
# FIXME: add link to wiki page
296296
print_errors_summary 'shellcheck', errors_count
297297
end
298298

@@ -395,7 +395,7 @@ if File.file?(validator_output)
395395
fail("html5validator error in #{file}:\n#{msg}")
396396
end
397397

398-
# TODO: add link to wiki page (#541)
398+
# FIXME: add link to wiki page (#541)
399399
print_errors_summary 'html5validator', errors_count
400400
end
401401

@@ -654,7 +654,7 @@ if File.file?(rf_report)
654654
file = github.html_link("#{file}#{line}")
655655
fail("robotframework-maven-plugin error in #{file}:\nTest case `#{testcase}` fails with message:\n#{msg}")
656656
end
657-
# TODO: add link to wiki page (#530)
657+
# FIXME: add link to wiki page (#530)
658658
print_errors_summary 'robotframework-maven-plugin', errors_count
659659
end
660660

@@ -690,7 +690,7 @@ if File.file?(failsafe_report)
690690
file = github.html_link(file)
691691
testcase = clazz.split('.')[-1] + '.' + node['name']
692692
msg = node.xpath('./exception/message').text.strip
693-
# TODO: highlight line number
693+
# FIXME: highlight line number
694694
fail("maven-failsafe-plugin error in #{file}:\nTest case `#{testcase}` fails with error:\n#{msg}")
695695
end
696696

‎docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ENV SPRING_PROFILES_ACTIVE=test
1616
# See also: https://docs.docker.com/engine/reference/builder/#run
1717
# NOTE: /data/uploads and /data/preview are being used only in "prod" profile.
1818
# - Setting up a timezone to Moscow time.
19-
# TODO: remove when #76 will be resolved and application will use UTC timezone.
19+
# FIXME: remove when #76 will be resolved and application will use UTC timezone.
2020
RUN mkdir /data \
2121
&& useradd mystamps --home-dir /data/mystamps --create-home --comment 'MyStamps' \
2222
&& mkdir /data/uploads /data/preview /data/heap-dumps \

‎docker/prod.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
# the generated root password will be printed to stdout (GENERATED ROOT PASSWORD: ...)
3030
- MYSQL_RANDOM_ROOT_PASSWORD=true
3131
- MYSQL_USER=mystamps
32-
# TODO: try to use a secret
32+
# FIXME: try to use a secret
3333
- MYSQL_PASSWORD=secret
3434
# the user specified above will be granted superuser access automatically
3535
- MYSQL_DATABASE=mystamps

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@
726726
<version>${dockerfile.plugin.version}</version>
727727
<configuration>
728728
<repository>phpcoder/mystamps</repository>
729-
<!-- TODO: set it to docker/ after https://github.com/spotify/dockerfile-maven/pull/89 will be merged -->
729+
<!-- FIXME: set it to docker/ after https://github.com/spotify/dockerfile-maven/pull/89 will be merged -->
730730
<contextDirectory>target</contextDirectory>
731731
</configuration>
732732
</plugin>
@@ -859,7 +859,7 @@
859859
<artifactId>maven-resources-plugin</artifactId>
860860
<version>${resources.plugin.version}</version>
861861
<executions>
862-
<!-- TODO: remove this workaround after merging https://github.com/spotify/dockerfile-maven/pull/89 -->
862+
<!-- FIXME: remove this workaround after merging https://github.com/spotify/dockerfile-maven/pull/89 -->
863863
<execution>
864864
<id>copy-docker-resources</id>
865865
<goals>

‎src/main/java/ru/mystamps/web/Url.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public final class Url {
110110
public static final String BOOTSTRAP_LANGUAGE = "https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css";
111111

112112
// CheckStyle: ignore LineLength for next 3 lines
113-
// TODO: use minimal version of CSS file when it will be available (https://github.com/webjars/selectize.js/issues/3)
113+
// FIXME: use minimal version of CSS file when it will be available (https://github.com/webjars/selectize.js/issues/3)
114114
public static final String SELECTIZE_CSS = "/public/selectize/0.12.4/css/selectize.bootstrap3.css";
115115
public static final String SELECTIZE_JS = "/public/selectize/0.12.4/js/standalone/selectize.min.js";
116116

‎src/main/java/ru/mystamps/web/controller/ErrorController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void notFound(
5050
@RequestHeader(name = "referer", required = false) String referer,
5151
@RequestHeader(name = "user-agent", required = false) String agent) {
5252

53-
// TODO: sanitize all user's values (#60)
53+
// FIXME: sanitize all user's values (#60)
5454
String ip = request.getRemoteAddr();
5555
String method = request.getMethod();
5656

@@ -64,7 +64,7 @@ public void internalError(
6464
@RequestAttribute(name = RequestDispatcher.ERROR_EXCEPTION, required = false) Exception exception,
6565
@RequestAttribute(name = RequestDispatcher.ERROR_REQUEST_URI, required = false) String page) {
6666

67-
// TODO: log to database (with *.status_code, *.message, *.servlet_name and user details)
67+
// FIXME: log to database (with *.status_code, *.message, *.servlet_name and user details)
6868

6969
if (page != null && !Url.INTERNAL_ERROR_PAGE.equals(page)) {
7070
LOG.error(

‎src/main/java/ru/mystamps/web/controller/SitemapController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
public class SitemapController {
4343
private static final Logger LOG = LoggerFactory.getLogger(SitemapController.class);
4444

45-
// TODO: convert dates to UTC and omit server-specific timezone part
45+
// FIXME: convert dates to UTC and omit server-specific timezone part
4646
// According to http://www.w3.org/TR/NOTE-datetime
4747
private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mmXXX";
4848

‎src/main/java/ru/mystamps/web/controller/interceptor/DownloadImageInterceptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public boolean preHandle(
114114
}
115115

116116
if (!SecurityContextUtils.hasAuthority(Authority.DOWNLOAD_IMAGE)) {
117-
// TODO(security): fix possible log injection
117+
// FIXME(security): fix possible log injection
118118
LOG.warn(
119119
"User #{} without permissions has tried to download a file from '{}'",
120120
SecurityContextUtils.getUserId(),

‎src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public List<Integer> findIdsByNames(List<String> names) {
103103
public List<Integer> findIdsWhenNameStartsWith(String name) {
104104
Validate.isTrue(StringUtils.isNotBlank(name), "Name must be non-blank");
105105

106-
// TODO: escape % and _ chars in name
106+
// FIXME: escape % and _ chars in name
107107
Validate.isTrue(
108108
!StringUtils.containsAny(name, '%', '_'),
109109
"Name must not contain '%' or '_' chars"

‎src/main/java/ru/mystamps/web/feature/collection/CollectionController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public String showPrices(
112112
return null;
113113
}
114114

115-
// TODO: we need only ownerName, without id and slug
115+
// FIXME: we need only ownerName, without id and slug
116116
CollectionInfoDto collection = collectionService.findBySlug(slug);
117117
if (collection == null) {
118118
response.sendError(HttpServletResponse.SC_NOT_FOUND);

0 commit comments

Comments
 (0)